Update AKO version 4.0.0 and k8s version (#342)

* Update AKO version 4.0.0 and k8s version * Update init tag to 2.2.4 * Update openshift version to 4.10
aerospike · Feb 6, 2025 · 58d283e · 58d283e
1 parent 45324e9
commit 58d283e
Show file tree

Hide file tree

Showing 34 changed files with 50 additions and 50 deletions.
diff --git 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/ubi9/ubi-minimal:latest
 
 # Version of Operator (build arg)
-ARG VERSION="3.4.1"
+ARG VERSION="4.0.0"
 
 # User to run container as
 ARG USER="root"

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -24,7 +24,7 @@ pipeline {
 
         AEROSPIKE_CUSTOM_INIT_REGISTRY="568976754000.dkr.ecr.ap-south-1.amazonaws.com"
         AEROSPIKE_CUSTOM_INIT_REGISTRY_NAMESPACE="aerospike"
-        AEROSPIKE_CUSTOM_INIT_NAME_TAG="aerospike-kubernetes-init:2.2.4-dev1"
+        AEROSPIKE_CUSTOM_INIT_NAME_TAG="aerospike-kubernetes-init:2.2.4"
     }
 
     stages {
@@ -119,7 +119,7 @@ boolean isNightly() {
 }
 
 String getVersion() {
-    def prefix = "3.4.1"
+    def prefix = "4.0.0"
     def candidateName = ""
     if(isNightly()) {
         def timestamp = new Date().format("yyyy-MM-dd")

diff --git a/Makefile b/Makefile
@@ -3,15 +3,15 @@
 
 ROOT_DIR=$(shell git rev-parse --show-toplevel)
 # Openshift platform supported version
-OPENSHIFT_VERSION="v4.9"
+OPENSHIFT_VERSION="v4.10"
 
 # VERSION defines the project version for the bundle.
 # Update this value when you upgrade the version of your project.
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - 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 ?= 3.4.1
+VERSION ?= 4.0.0
 
 # Platforms supported
 PLATFORMS ?= linux/amd64,linux/arm64
@@ -315,7 +315,7 @@ submodules: ## Pull and update git submodules recursively
 
 # 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:3.4.1 make bundle
+# CHANNELS=stable DEFAULT_CHANNEL=stable OPENSHIFT_VERSION=v4.10 IMG=docker.io/aerospike/aerospike-kubernetes-operator-nightly:4.0.0 make bundle
 .PHONY: bundle
 bundle: manifests kustomize operator-sdk
 	rm -rf $(ROOT_DIR)/bundle.Dockerfile $(BUNDLE_DIR)

diff --git a/README.md b/README.md
@@ -44,7 +44,7 @@ Run the following command with the appropriate name and version for the operator
 
 ```sh
 IMAGE_TAG_BASE=aerospike/aerospike-kubernetes-operator-nightly
-VERSION=3.4.1
+VERSION=4.0.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
@@ -84,8 +84,8 @@ operator using OLM.
 
 ### Install operator-sdk
 
-Install operator-sdk version 1.36.0 using the
-installation [guide](https://v1-36-x.sdk.operatorframework.io/docs/installation/)
+Install operator-sdk version 1.39.1 using the
+installation [guide](https://v1-39-x.sdk.operatorframework.io/docs/installation/)
 
 ### Build the bundle
 
@@ -96,7 +96,7 @@ Set up the environment with image names.
 ```shell
 export ACCOUNT=aerospike
 export IMAGE_TAG_BASE=${ACCOUNT}/aerospike-kubernetes-operator
-export VERSION=3.4.1
+export VERSION=4.0.0
 export IMG=docker.io/${IMAGE_TAG_BASE}-nightly:${VERSION}
 export BUNDLE_IMG=docker.io/${IMAGE_TAG_BASE}-bundle-nightly:${VERSION}
 export CATALOG_IMG=docker.io/${IMAGE_TAG_BASE}-catalog-nightly:${VERSION}
@@ -221,7 +221,7 @@ operator-sdk cleanup aerospike-kubernetes-operator --namespace=aerospike
 
 ### Running tests
 
-The operator tests require following prerequisites
+The operator tests require the following prerequisites
 
 - A running Kubernetes cluster with at least 3 nodes with at least 12 CPUs
 - A storage class named "ssd" that allows provisioning of filesystem and block devices

diff --git a/api/v1/aerospikecluster_types.go b/api/v1/aerospikecluster_types.go
@@ -1167,7 +1167,7 @@ type AerospikePodStatus struct { //nolint:govet // for readability
 
 // AerospikeCluster is the schema for the AerospikeCluster API
 // +operator-sdk:csv:customresourcedefinitions:displayName="Aerospike Cluster",resources={{Service, v1},{Pod,v1},{StatefulSet,v1}}
-// +kubebuilder:metadata:annotations="aerospike-kubernetes-operator/version=3.4.1"
+// +kubebuilder:metadata:annotations="aerospike-kubernetes-operator/version=4.0.0"
 //
 //nolint:lll // for readability
 type AerospikeCluster struct { //nolint:govet // for readability

diff --git a/api/v1/utils.go b/api/v1/utils.go
@@ -74,7 +74,7 @@ const (
 	AerospikeInitContainerNameTagEnvVar            = "AEROSPIKE_KUBERNETES_INIT_NAME_TAG"
 	AerospikeInitContainerDefaultRegistry          = "docker.io"
 	AerospikeInitContainerDefaultRegistryNamespace = "aerospike"
-	AerospikeInitContainerDefaultNameAndTag        = "aerospike-kubernetes-init:2.2.4-dev1"
+	AerospikeInitContainerDefaultNameAndTag        = "aerospike-kubernetes-init:2.2.4"
 	AerospikeAppLabel                              = "app"
 	AerospikeAppLabelValue                         = "aerospike-cluster"
 	AerospikeCustomResourceLabel                   = "aerospike.com/cr"

diff --git a/api/v1beta1/aerospikebackup_types.go b/api/v1beta1/aerospikebackup_types.go
@@ -86,7 +86,7 @@ type AerospikeBackupStatus struct {
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
-// +kubebuilder:metadata:annotations="aerospike-kubernetes-operator/version=3.4.1"
+// +kubebuilder:metadata:annotations="aerospike-kubernetes-operator/version=4.0.0"
 // +kubebuilder:printcolumn:name="Backup Service Name",type=string,JSONPath=`.spec.backupService.name`
 // +kubebuilder:printcolumn:name="Backup Service Namespace",type=string,JSONPath=`.spec.backupService.namespace`
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"

diff --git a/api/v1beta1/aerospikebackupservice_types.go b/api/v1beta1/aerospikebackupservice_types.go
@@ -161,7 +161,7 @@ type ServiceContainerSpec struct {
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
-// +kubebuilder:metadata:annotations="aerospike-kubernetes-operator/version=3.4.1"
+// +kubebuilder:metadata:annotations="aerospike-kubernetes-operator/version=4.0.0"
 // +kubebuilder:printcolumn:name="Image",type=string,JSONPath=`.spec.image`
 // +kubebuilder:printcolumn:name="Service Type",type=string,JSONPath=`.spec.service.type`
 // +kubebuilder:printcolumn:name="Phase",type=string,JSONPath=`.status.phase`

diff --git a/api/v1beta1/aerospikerestore_types.go b/api/v1beta1/aerospikerestore_types.go
@@ -89,7 +89,7 @@ type AerospikeRestoreStatus struct {
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
-// +kubebuilder:metadata:annotations="aerospike-kubernetes-operator/version=3.4.1"
+// +kubebuilder:metadata:annotations="aerospike-kubernetes-operator/version=4.0.0"
 // +kubebuilder:printcolumn:name="Backup Service Name",type=string,JSONPath=`.spec.backupService.name`
 // +kubebuilder:printcolumn:name="Backup Service Namespace",type=string,JSONPath=`.spec.backupService.namespace`
 // +kubebuilder:printcolumn:name="Phase",type=string,JSONPath=`.status.phase`

diff --git a/config/crd/bases/asdb.aerospike.com_aerospikebackups.yaml b/config/crd/bases/asdb.aerospike.com_aerospikebackups.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    aerospike-kubernetes-operator/version: 3.4.1
+    aerospike-kubernetes-operator/version: 4.0.0
     controller-gen.kubebuilder.io/version: v0.16.1
   name: aerospikebackups.asdb.aerospike.com
 spec:

diff --git a/config/crd/bases/asdb.aerospike.com_aerospikebackupservices.yaml b/config/crd/bases/asdb.aerospike.com_aerospikebackupservices.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    aerospike-kubernetes-operator/version: 3.4.1
+    aerospike-kubernetes-operator/version: 4.0.0
     controller-gen.kubebuilder.io/version: v0.16.1
   name: aerospikebackupservices.asdb.aerospike.com
 spec:

diff --git a/config/crd/bases/asdb.aerospike.com_aerospikeclusters.yaml b/config/crd/bases/asdb.aerospike.com_aerospikeclusters.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    aerospike-kubernetes-operator/version: 3.4.1
+    aerospike-kubernetes-operator/version: 4.0.0
     controller-gen.kubebuilder.io/version: v0.16.1
   name: aerospikeclusters.asdb.aerospike.com
 spec:

diff --git a/config/crd/bases/asdb.aerospike.com_aerospikerestores.yaml b/config/crd/bases/asdb.aerospike.com_aerospikerestores.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    aerospike-kubernetes-operator/version: 3.4.1
+    aerospike-kubernetes-operator/version: 4.0.0
     controller-gen.kubebuilder.io/version: v0.16.1
   name: aerospikerestores.asdb.aerospike.com
 spec:

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -10,4 +10,4 @@ generatorOptions:
 images:
 - name: controller
   newName: docker.io/aerospike/aerospike-kubernetes-operator-nightly
-  newTag: 3.4.1
+  newTag: 4.0.0
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -68,7 +68,7 @@ spec:
           value: aerospike
         - name: AEROSPIKE_KUBERNETES_INIT_NAME_TAG
           # this is the name and tag of aerospike-init image
-          value: aerospike-kubernetes-init:2.2.4-dev1
+          value: aerospike-kubernetes-init:2.2.4
       volumes: []
       serviceAccountName: controller-manager
 

diff --git a/config/manifests/bases/aerospike-kubernetes-operator.clusterserviceversion.yaml b/config/manifests/bases/aerospike-kubernetes-operator.clusterserviceversion.yaml
@@ -231,7 +231,7 @@ spec:
   - email: [email protected]
     name: Aerospike, Inc.
   maturity: stable
-  minKubeVersion: 1.19.0
+  minKubeVersion: 1.23.0
   provider:
     name: Aerospike
   version: 0.0.0
diff --git a/helm-charts/aerospike-backup-service/Chart.yaml b/helm-charts/aerospike-backup-service/Chart.yaml
@@ -3,9 +3,9 @@ type: application
 name: aerospike-backup-service
 
 # version tracks chart changes
-version: 3.4.1
+version: 4.0.0
 # appVersion tracks operator version
-appVersion: 3.4.1
+appVersion: 4.0.0
 
 description: A Helm chart for Aerospike Backup Service Custom Resource
 icon: https://avatars0.githubusercontent.com/u/2214313?s=200&v=4

diff --git a/helm-charts/aerospike-backup-service/README.md b/helm-charts/aerospike-backup-service/README.md
@@ -4,7 +4,7 @@ A Helm chart for `AerospikeBackupService` (ABS) custom resource to be used with
 
 ## Pre Requisites
 
-- Kubernetes 1.19+
+- Kubernetes 1.23+
 - Aerospike Kubernetes Operator
 
 ## Usage

diff --git a/helm-charts/aerospike-backup/Chart.yaml b/helm-charts/aerospike-backup/Chart.yaml
@@ -3,9 +3,9 @@ type: application
 name: aerospike-backup
 
 # version tracks chart changes
-version: 3.4.1
+version: 4.0.0
 # appVersion tracks operator version
-appVersion: 3.4.1
+appVersion: 4.0.0
 
 description: A Helm chart for Aerospike Backup Custom Resource
 icon: https://avatars0.githubusercontent.com/u/2214313?s=200&v=4

diff --git a/helm-charts/aerospike-backup/README.md b/helm-charts/aerospike-backup/README.md
@@ -4,7 +4,7 @@ A Helm chart for `AerospikeBackup` custom resource to be used with the Aerospike
 
 ## Pre Requisites
 
-- Kubernetes 1.19+
+- Kubernetes 1.23+
 - Aerospike Kubernetes Operator
 
 ## Usage

diff --git 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: 3.4.1
+version: 4.0.0
 # appVersion tracks operator version
-appVersion: 3.4.1
+appVersion: 4.0.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-cluster/README.md b/helm-charts/aerospike-cluster/README.md
@@ -4,7 +4,7 @@ A Helm chart for `AerospikeCluster` custom resource to be used with the Aerospik
 
 ## Pre Requisites
 
-- Kubernetes 1.19+
+- Kubernetes 1.23+
 - Aerospike Kubernetes Operator
 
 ## Usage

diff --git 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: 3.4.1
+version: 4.0.0
 # appVersion tracks operator version
-appVersion: 3.4.1
+appVersion: 4.0.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
@@ -4,7 +4,7 @@ A Helm chart for Aerospike Kubernetes Operator
 
 ## Pre Requisites
 
-- Kubernetes 1.19+
+- Kubernetes 1.23+
 
 ## Usage
 
@@ -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                                                                                    | `3.4.1`                                                                                                           |
+| `operatorImage.tag`                 | Operator image tag                                                                                    | `4.0.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/...ubernetes-operator/crds/customresourcedefinition_aerospikebackups.asdb.aerospike.com.yaml b/...ubernetes-operator/crds/customresourcedefinition_aerospikebackups.asdb.aerospike.com.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    aerospike-kubernetes-operator/version: 3.4.1
+    aerospike-kubernetes-operator/version: 4.0.0
     controller-gen.kubebuilder.io/version: v0.16.1
   name: aerospikebackups.asdb.aerospike.com
 spec:

diff --git a/...es-operator/crds/customresourcedefinition_aerospikebackupservices.asdb.aerospike.com.yaml b/...es-operator/crds/customresourcedefinition_aerospikebackupservices.asdb.aerospike.com.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    aerospike-kubernetes-operator/version: 3.4.1
+    aerospike-kubernetes-operator/version: 4.0.0
     controller-gen.kubebuilder.io/version: v0.16.1
   name: aerospikebackupservices.asdb.aerospike.com
 spec:

diff --git a/...bernetes-operator/crds/customresourcedefinition_aerospikeclusters.asdb.aerospike.com.yaml b/...bernetes-operator/crds/customresourcedefinition_aerospikeclusters.asdb.aerospike.com.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    aerospike-kubernetes-operator/version: 3.4.1
+    aerospike-kubernetes-operator/version: 4.0.0
     controller-gen.kubebuilder.io/version: v0.16.1
   name: aerospikeclusters.asdb.aerospike.com
 spec:

diff --git a/...bernetes-operator/crds/customresourcedefinition_aerospikerestores.asdb.aerospike.com.yaml b/...bernetes-operator/crds/customresourcedefinition_aerospikerestores.asdb.aerospike.com.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    aerospike-kubernetes-operator/version: 3.4.1
+    aerospike-kubernetes-operator/version: 4.0.0
     controller-gen.kubebuilder.io/version: v0.16.1
   name: aerospikerestores.asdb.aerospike.com
 spec:

diff --git 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: 3.4.1
+  tag: 4.0.0
   pullPolicy: IfNotPresent
 
 ## In case the above image is pulled from a registry that requires
@@ -41,7 +41,7 @@ aerospikeKubernetesInitRegistry: "docker.io"
 aerospikeKubernetesInitRegistryNamespace: "aerospike"
 
 # Name and tag of aerospike-init image
-aerospikeKubernetesInitNameTag: "aerospike-kubernetes-init:2.2.4-dev1"
+aerospikeKubernetesInitNameTag: "aerospike-kubernetes-init:2.2.4"
 
 ## Resources - limits / requests
 resources:

diff --git a/helm-charts/aerospike-restore/Chart.yaml b/helm-charts/aerospike-restore/Chart.yaml
@@ -3,9 +3,9 @@ type: application
 name: aerospike-restore
 
 # version tracks chart changes
-version: 3.4.1
+version: 4.0.0
 # appVersion tracks operator version
-appVersion: 3.4.1
+appVersion: 4.0.0
 
 description: A Helm chart for Aerospike Restore Custom Resource
 icon: https://avatars0.githubusercontent.com/u/2214313?s=200&v=4

diff --git a/helm-charts/aerospike-restore/README.md b/helm-charts/aerospike-restore/README.md
@@ -4,7 +4,7 @@ A Helm chart for `AerospikeRestore` custom resource to be used with the Aerospik
 
 ## Pre Requisites
 
-- Kubernetes 1.19+
+- Kubernetes 1.23+
 - Aerospike Kubernetes Operator
 
 ## Usage

diff --git a/test/cluster/cluster_test.go b/test/cluster/cluster_test.go
@@ -26,7 +26,7 @@ var _ = Describe(
 
 		// Cluster lifecycle related
 		Context(
-			"DeployClusterPost490", func() {
+			"DeployClusterPost570", func() {
 				DeployClusterForAllImagesPost570(ctx)
 			},
 		)
@@ -654,7 +654,7 @@ func deployClusterForMaxIgnorablePods(ctx goctx.Context, clusterNamespacedName t
 	Expect(err).ToNot(HaveOccurred())
 }
 
-// Test cluster deployment with all image post 4.9.0
+// Test cluster deployment with all image post 5.7.0 except the latest version
 func DeployClusterForAllImagesPost570(ctx goctx.Context) {
 	versions := []string{
 		"7.2.0.6", "7.1.0.12", "7.0.0.20", "6.4.0.7", "6.3.0.13", "6.2.0.9", "6.1.0.14", "6.0.0.16",