Skip to content

Commit

Permalink
Version changes for 2.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
ashishshinde committed Sep 29, 2022
1 parent 7e9277e commit 2a92c8c
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o manager
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest

# Version of Operator (build arg)
ARG VERSION="2.2.0"
ARG VERSION="2.2.1"

# User to run container as
ARG USER="root"
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ boolean isNightly() {
}

String getVersion() {
def prefix = "2.2.0"
def prefix = "2.2.1"
def candidateName = ""
if(isNightly()) {
def timestamp = new Date().format("yyyy-MM-dd")
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ OPENSHIFT_VERSION="v4.6"
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
# TODO: Version must be pulled from git tags
VERSION ?= 2.2.0
VERSION ?= 2.2.1

OS := $(shell uname -s)
DATE := $(shell date -u +"%Y-%m-%dT%H:%M:%S%Z")
Expand Down Expand Up @@ -180,7 +180,7 @@ endef

# Generate bundle manifests and metadata, then validate generated files.
# For OpenShift bundles run
# CHANNELS=stable DEFAULT_CHANNEL=stable OPENSHIFT_VERSION=v4.6 IMG=docker.io/aerospike/aerospike-kubernetes-operator-nightly:2.2.0-5-dev make bundle
# CHANNELS=stable DEFAULT_CHANNEL=stable OPENSHIFT_VERSION=v4.6 IMG=docker.io/aerospike/aerospike-kubernetes-operator-nightly:2.2.1-5-dev make bundle
.PHONY: bundle
bundle: manifests kustomize
rm -rf bundle.Dockerfile bundle/
Expand Down
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Run the following command with the appropriate name and version for the operator

```sh
IMAGE_TAG_BASE=aerospike/aerospike-kubernetes-operator-nightly
VERSION=2.2.0-dev
VERSION=2.2.1-dev
make docker-build docker-push IMG=${IMAGE_TAG_BASE}:${VERSION}
```

Expand Down Expand Up @@ -93,7 +93,7 @@ Set up the environment with image names.
```shell
export ACCOUNT=aerospike
export IMAGE_TAG_BASE=${ACCOUNT}/aerospike-kubernetes-operator
export VERSION=2.2.0-dev
export VERSION=2.2.1-dev
export IMG=docker.io/${IMAGE_TAG_BASE}-nightly:${VERSION}
export BUNDLE_IMG=docker.io/${IMAGE_TAG_BASE}-bundle-nightly:${VERSION}
```
Expand Down Expand Up @@ -154,16 +154,16 @@ kubectl -n ns1 create serviceaccount aerospike-operator-controller-manager

```shell
kubectl get clusterrolebindings.rbac.authorization.k8s.io | grep aerospike-kubernetes-operator
aerospike-kubernetes-operator.v2.2.0-74b946466d ClusterRole/aerospike-kubernetes-operator.v2.2.0-74b946466d 41m
aerospike-kubernetes-operator.v2.2.1-74b946466d ClusterRole/aerospike-kubernetes-operator.v2.2.1-74b946466d 41m
```

In the example above the name of the cluster role binding is `aerospike-kubernetes-operator.v2.2.0-74b946466d`
In the example above the name of the cluster role binding is `aerospike-kubernetes-operator.v2.2.1-74b946466d`

Edit the role binding and add a new subject entry for the service account

```shell
# Replace aerospike-kubernetes-operator.v2.2.0-5-dev-74b946466d with the name of the cluster role binding found above
kubectl edit clusterrolebindings.rbac.authorization.k8s.io aerospike-kubernetes-operator.v2.2.0-5-dev-74b946466d
# Replace aerospike-kubernetes-operator.v2.2.1-5-dev-74b946466d with the name of the cluster role binding found above
kubectl edit clusterrolebindings.rbac.authorization.k8s.io aerospike-kubernetes-operator.v2.2.1-5-dev-74b946466d
```

In the editor that is launched append the following lines to the subjects section as shown below
Expand All @@ -184,17 +184,17 @@ kind: ClusterRoleBinding
metadata:
creationTimestamp: "2021-09-16T10:48:36Z"
labels:
olm.owner: aerospike-kubernetes-operator.v2.2.0-5-dev
olm.owner: aerospike-kubernetes-operator.v2.2.1-5-dev
olm.owner.kind: ClusterServiceVersion
olm.owner.namespace: test
operators.coreos.com/aerospike-kubernetes-operator.test: ""
name: aerospike-kubernetes-operator.v2.2.0-5-dev-74b946466d
name: aerospike-kubernetes-operator.v2.2.1-5-dev-74b946466d
resourceVersion: "51841234"
uid: be546dd5-b21e-4cc3-8a07-e2fe5fe5274c
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: aerospike-kubernetes-operator.v2.2.0-5-dev-74b946466d
name: aerospike-kubernetes-operator.v2.2.1-5-dev-74b946466d
subjects:
- kind: ServiceAccount
name: aerospike-operator-controller-manager
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ kind: Kustomization
images:
- name: controller
newName: docker.io/aerospike/aerospike-kubernetes-operator-nightly
newTag: 2.2.0-dev
newTag: 2.2.1-dev
4 changes: 2 additions & 2 deletions helm-charts/aerospike-cluster/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ type: application
name: aerospike-cluster

# version tracks chart changes
version: 2.2.0
version: 2.2.1
# appVersion tracks operator version
appVersion: 2.2.0
appVersion: 2.2.1

description: A Helm chart for Aerospike Cluster Custom Resource
icon: https://avatars0.githubusercontent.com/u/2214313?s=200&v=4
Expand Down
4 changes: 2 additions & 2 deletions helm-charts/aerospike-kubernetes-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ type: application
name: aerospike-kubernetes-operator

# version tracks chart changes
version: 2.2.0
version: 2.2.1
# appVersion tracks operator version
appVersion: 2.2.0
appVersion: 2.2.1

description: A Helm chart for Aerospike Kubernetes Operator
icon: https://avatars0.githubusercontent.com/u/2214313?s=200&v=4
Expand Down
2 changes: 1 addition & 1 deletion helm-charts/aerospike-kubernetes-operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ helm install aerospike-kubernetes-operator ./aerospike-kubernetes-operator --set
| ---------- | ----------- |-------------------------------------------------------------------------------------------------------------------|
| `replicas` | Number of operator replicas | `2` |
| `operatorImage.repository` | Operator image repository | `aerospike/aerospike-kubernetes-operator` |
| `operatorImage.tag` | Operator image tag | `2.2.0` |
| `operatorImage.tag` | Operator image tag | `2.2.1` |
| `operatorImage.pullPolicy` | Image pull policy | `IfNotPresent` |
| `imagePullSecrets` | Secrets containing credentials to pull Operator image from a private registry | `{}` (nil) |
| `rbac.create` | Set this to `true` to let helm chart automatically create RBAC resources necessary for operator | `true` |
Expand Down
2 changes: 1 addition & 1 deletion helm-charts/aerospike-kubernetes-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ replicas: 2
## Operator image
operatorImage:
repository: aerospike/aerospike-kubernetes-operator
tag: 2.2.0
tag: 2.2.1
# pullPolicy: IfNotPresent

## In case the above image is pulled from a registry that requires
Expand Down

0 comments on commit 2a92c8c

Please sign in to comment.