From f8dbcda1482e81ccbc884cccb07c6bd92c6e75db Mon Sep 17 00:00:00 2001 From: Sudhanshu Ranjan Date: Thu, 12 Jan 2023 22:39:05 +0530 Subject: [PATCH] 2.4.0 dev (#177) * Update Operator version to 2.4.0 * Update CRD file for helm chart --- Dockerfile | 2 +- Jenkinsfile | 2 +- Makefile | 4 +- README.md | 18 +++--- config/manager/kustomization.yaml | 2 +- helm-charts/aerospike-cluster/Chart.yaml | 4 +- .../aerospike-kubernetes-operator/Chart.yaml | 4 +- .../aerospike-kubernetes-operator/README.md | 2 +- ..._aerospikeclusters.asdb.aerospike.com.yaml | 56 +++++++++++++++++++ .../aerospike-kubernetes-operator/values.yaml | 2 +- 10 files changed, 76 insertions(+), 20 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0ac73a980..01f5cbbe4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} GO111MODULE=on go FROM registry.access.redhat.com/ubi8/ubi-minimal:latest # Version of Operator (build arg) -ARG VERSION="2.3.0" +ARG VERSION="2.4.0" # User to run container as ARG USER="root" diff --git a/Jenkinsfile b/Jenkinsfile index 0c9f40137..382fd8d34 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -106,7 +106,7 @@ boolean isNightly() { } String getVersion() { - def prefix = "2.3.0" + def prefix = "2.4.0" def candidateName = "" if(isNightly()) { def timestamp = new Date().format("yyyy-MM-dd") diff --git a/Makefile b/Makefile index 07f77860c..dd22d6cf8 100644 --- a/Makefile +++ b/Makefile @@ -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.3.0 +VERSION ?= 2.4.0 # Platforms supported PLATFORMS ?= linux/amd64,linux/arm64 @@ -228,7 +228,7 @@ $(ENVTEST): $(LOCALBIN) # 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.3.0-5-dev make bundle +# CHANNELS=stable DEFAULT_CHANNEL=stable OPENSHIFT_VERSION=v4.6 IMG=docker.io/aerospike/aerospike-kubernetes-operator-nightly:2.4.0-5-dev make bundle .PHONY: bundle bundle: manifests kustomize rm -rf bundle.Dockerfile bundle/ diff --git a/README.md b/README.md index 32c9019fc..719767614 100644 --- a/README.md +++ b/README.md @@ -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.3.0 +VERSION=2.4.0 make docker-buildx IMG=${IMAGE_TAG_BASE}:${VERSION} PLATFORMS=linux/amd64 ``` **Note**: Change `PLATFORMS` var as per host machine or remove it to build multi-arch image @@ -94,7 +94,7 @@ Set up the environment with image names. ```shell export ACCOUNT=aerospike export IMAGE_TAG_BASE=${ACCOUNT}/aerospike-kubernetes-operator -export VERSION=2.3.0 +export VERSION=2.4.0 export IMG=docker.io/${IMAGE_TAG_BASE}-nightly:${VERSION} export BUNDLE_IMG=docker.io/${IMAGE_TAG_BASE}-bundle-nightly:${VERSION} ``` @@ -155,16 +155,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.3.0-74b946466d ClusterRole/aerospike-kubernetes-operator.v2.3.0-74b946466d 41m +aerospike-kubernetes-operator.v2.4.0-74b946466d ClusterRole/aerospike-kubernetes-operator.v2.4.0-74b946466d 41m ``` -In the example above the name of the cluster role binding is `aerospike-kubernetes-operator.v2.3.0-74b946466d` +In the example above the name of the cluster role binding is `aerospike-kubernetes-operator.v2.4.0-74b946466d` Edit the role binding and add a new subject entry for the service account ```shell -# Replace aerospike-kubernetes-operator.v2.3.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.3.0-5-dev-74b946466d +# Replace aerospike-kubernetes-operator.v2.4.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.4.0-5-dev-74b946466d ``` In the editor that is launched append the following lines to the subjects section as shown below @@ -185,17 +185,17 @@ kind: ClusterRoleBinding metadata: creationTimestamp: "2021-09-16T10:48:36Z" labels: - olm.owner: aerospike-kubernetes-operator.v2.3.0-5-dev + olm.owner: aerospike-kubernetes-operator.v2.4.0-5-dev olm.owner.kind: ClusterServiceVersion olm.owner.namespace: test operators.coreos.com/aerospike-kubernetes-operator.test: "" - name: aerospike-kubernetes-operator.v2.3.0-5-dev-74b946466d + name: aerospike-kubernetes-operator.v2.4.0-5-dev-74b946466d resourceVersion: "51841234" uid: be546dd5-b21e-4cc3-8a07-e2fe5fe5274c roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: aerospike-kubernetes-operator.v2.3.0-5-dev-74b946466d + name: aerospike-kubernetes-operator.v2.4.0-5-dev-74b946466d subjects: - kind: ServiceAccount name: aerospike-operator-controller-manager diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 4ce2f8722..c873e7821 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,4 +13,4 @@ kind: Kustomization images: - name: controller newName: docker.io/aerospike/aerospike-kubernetes-operator-nightly - newTag: 2.3.0 + newTag: 2.4.0 diff --git a/helm-charts/aerospike-cluster/Chart.yaml b/helm-charts/aerospike-cluster/Chart.yaml index 4f63cb952..887373749 100644 --- a/helm-charts/aerospike-cluster/Chart.yaml +++ b/helm-charts/aerospike-cluster/Chart.yaml @@ -3,9 +3,9 @@ type: application name: aerospike-cluster # version tracks chart changes -version: 2.3.0 +version: 2.4.0 # appVersion tracks operator version -appVersion: 2.3.0 +appVersion: 2.4.0 description: A Helm chart for Aerospike Cluster Custom Resource icon: https://avatars0.githubusercontent.com/u/2214313?s=200&v=4 diff --git a/helm-charts/aerospike-kubernetes-operator/Chart.yaml b/helm-charts/aerospike-kubernetes-operator/Chart.yaml index 8337d5ee4..88fd0e1ce 100644 --- a/helm-charts/aerospike-kubernetes-operator/Chart.yaml +++ b/helm-charts/aerospike-kubernetes-operator/Chart.yaml @@ -3,9 +3,9 @@ type: application name: aerospike-kubernetes-operator # version tracks chart changes -version: 2.3.0 +version: 2.4.0 # appVersion tracks operator version -appVersion: 2.3.0 +appVersion: 2.4.0 description: A Helm chart for Aerospike Kubernetes Operator icon: https://avatars0.githubusercontent.com/u/2214313?s=200&v=4 diff --git a/helm-charts/aerospike-kubernetes-operator/README.md b/helm-charts/aerospike-kubernetes-operator/README.md index c997e27e2..adf5d8ff6 100644 --- a/helm-charts/aerospike-kubernetes-operator/README.md +++ b/helm-charts/aerospike-kubernetes-operator/README.md @@ -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.3.0` | +| `operatorImage.tag` | Operator image tag | `2.4.0` | | `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` | diff --git a/helm-charts/aerospike-kubernetes-operator/crds/customresourcedefinition_aerospikeclusters.asdb.aerospike.com.yaml b/helm-charts/aerospike-kubernetes-operator/crds/customresourcedefinition_aerospikeclusters.asdb.aerospike.com.yaml index 3d87aa3f9..dc817f777 100644 --- a/helm-charts/aerospike-kubernetes-operator/crds/customresourcedefinition_aerospikeclusters.asdb.aerospike.com.yaml +++ b/helm-charts/aerospike-kubernetes-operator/crds/customresourcedefinition_aerospikeclusters.asdb.aerospike.com.yaml @@ -3696,6 +3696,10 @@ spec: - deleteFiles type: string type: object + cleanupThreads: + description: CleanupThreads contains maximum number + of cleanup threads(dd or blkdis + type: integer filesystemVolumePolicy: description: FileSystemVolumePolicy contains default policies for filesystem volume @@ -4827,6 +4831,10 @@ spec: - deleteFiles type: string type: object + cleanupThreads: + description: CleanupThreads contains maximum number + of cleanup threads(dd or blkdis + type: integer filesystemVolumePolicy: description: FileSystemVolumePolicy contains default policies for filesystem volume @@ -5257,7 +5265,20 @@ spec: type: object nullable: true type: array + rollingUpdateBatchSize: + anyOf: + - type: integer + - type: string + description: RollingUpdateBatchSize is the percentage/number of + rack pods that will + x-kubernetes-int-or-string: true type: object + rosterNodeBlockList: + description: RosterNodeBlockList is a list of blocked nodeIDs from + roster in a stro + items: + type: string + type: array seedsFinderServices: description: SeedsFinderServices creates additional Kubernetes service that allow c @@ -5352,6 +5373,10 @@ spec: - deleteFiles type: string type: object + cleanupThreads: + description: CleanupThreads contains maximum number of cleanup + threads(dd or blkdis + type: integer filesystemVolumePolicy: description: FileSystemVolumePolicy contains default policies for filesystem volume @@ -8781,6 +8806,12 @@ spec: description: 'AerospikeConfigHash is ripemd160 hash of aerospikeConfig used by this ' type: string + dirtyVolumes: + description: DirtyVolumes is the list of volume names that are + removed from aerospi + items: + type: string + type: array hostExternalIP: description: HostExternalIP of the K8s host this pod is scheduled on. @@ -9557,6 +9588,10 @@ spec: - deleteFiles type: string type: object + cleanupThreads: + description: CleanupThreads contains maximum number + of cleanup threads(dd or blkdis + type: integer filesystemVolumePolicy: description: FileSystemVolumePolicy contains default policies for filesystem volume @@ -10688,6 +10723,10 @@ spec: - deleteFiles type: string type: object + cleanupThreads: + description: CleanupThreads contains maximum number + of cleanup threads(dd or blkdis + type: integer filesystemVolumePolicy: description: FileSystemVolumePolicy contains default policies for filesystem volume @@ -11118,6 +11157,13 @@ spec: type: object nullable: true type: array + rollingUpdateBatchSize: + anyOf: + - type: integer + - type: string + description: RollingUpdateBatchSize is the percentage/number of + rack pods that will + x-kubernetes-int-or-string: true type: object resources: description: Define resources requests and limits for Aerospike Server @@ -11144,6 +11190,12 @@ spec: resources required. type: object type: object + rosterNodeBlockList: + description: RosterNodeBlockList is a list of blocked nodeIDs from + roster in a stro + items: + type: string + type: array seedsFinderServices: description: SeedsFinderServices describes services which are used for seeding Aero @@ -11238,6 +11290,10 @@ spec: - deleteFiles type: string type: object + cleanupThreads: + description: CleanupThreads contains maximum number of cleanup + threads(dd or blkdis + type: integer filesystemVolumePolicy: description: FileSystemVolumePolicy contains default policies for filesystem volume diff --git a/helm-charts/aerospike-kubernetes-operator/values.yaml b/helm-charts/aerospike-kubernetes-operator/values.yaml index 1d77e944c..7509904cb 100644 --- a/helm-charts/aerospike-kubernetes-operator/values.yaml +++ b/helm-charts/aerospike-kubernetes-operator/values.yaml @@ -4,7 +4,7 @@ replicas: 2 ## Operator image operatorImage: repository: aerospike/aerospike-kubernetes-operator - tag: 2.3.0 + tag: 2.4.0 # pullPolicy: IfNotPresent ## In case the above image is pulled from a registry that requires