RBAC bug fix and helm-charts update (#340)

abhishekdwivedi3060 · web-flow · commit 45324e91b3c6 · 2025-02-06T18:08:14.000+05:30
* RBAC bug fix and helm-charts update

* Fixed waitForDeploymentToBeReady func

* Updated schema git sub-module SHA for Aerospike server 8.0.0

* Fixed backup service config change comparison

* Update 8.0.0.0 tag in samples and test-cases
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -85,6 +85,7 @@ rules:
   - delete
   - get
   - list
+  - update
   - watch
 - apiGroups:
   - ""
diff --git a/config/samples/all_flash_cluster_cr.yaml b/config/samples/all_flash_cluster_cr.yaml
@@ -12,7 +12,7 @@ metadata:
 
 spec:
   size: 2
-  image: aerospike/aerospike-server-enterprise:7.2.0.1
+  image: aerospike/aerospike-server-enterprise:8.0.0.2
 
   storage:
     filesystemVolumePolicy:
diff --git a/config/samples/dim_nostorage_cluster_cr.yaml b/config/samples/dim_nostorage_cluster_cr.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: aerospike
 spec:
   size: 2
-  image: aerospike/aerospike-server-enterprise:7.2.0.1
+  image: aerospike/aerospike-server-enterprise:8.0.0.2
 
   podSpec:
     multiPodPerHost: true
diff --git a/config/samples/dim_nostorage_cluster_skip_validation_cr.yaml b/config/samples/dim_nostorage_cluster_skip_validation_cr.yaml
@@ -20,7 +20,7 @@ metadata:
 
 spec:
   size: 2
-  image: aerospike/aerospike-server-enterprise:7.2.0.1
+  image: aerospike/aerospike-server-enterprise:8.0.0.2
   podSpec:
     multiPodPerHost: true
 
diff --git a/config/samples/hdd_dim_storage_cluster_cr.yaml b/config/samples/hdd_dim_storage_cluster_cr.yaml
@@ -6,7 +6,7 @@ metadata:
 
 spec:
   size: 2
-  image: aerospike/aerospike-server-enterprise:7.2.0.1
+  image: aerospike/aerospike-server-enterprise:8.0.0.2
 
   storage:
     filesystemVolumePolicy:
diff --git a/config/samples/host_network_cluster_cr.yaml b/config/samples/host_network_cluster_cr.yaml
@@ -6,7 +6,7 @@ metadata:
 
 spec:
   size: 2
-  image: aerospike/aerospike-server-enterprise:7.2.0.1
+  image: aerospike/aerospike-server-enterprise:8.0.0.2
 
   storage:
     filesystemVolumePolicy:
diff --git a/config/samples/ldap_cluster_cr.yaml b/config/samples/ldap_cluster_cr.yaml
@@ -14,7 +14,7 @@ metadata:
   namespace: aerospike
 spec:
   size: 2
-  image: aerospike/aerospike-server-enterprise:7.2.0.1
+  image: aerospike/aerospike-server-enterprise:8.0.0.2
 
   podSpec:
     multiPodPerHost: true
diff --git a/config/samples/pmem_cluster_cr.yaml b/config/samples/pmem_cluster_cr.yaml
@@ -6,7 +6,7 @@ metadata:
 
 spec:
   size: 2
-  image: aerospike/aerospike-server-enterprise:7.2.0.1
+  image: aerospike/aerospike-server-enterprise:8.0.0.2
 
   storage:
     filesystemVolumePolicy:
diff --git a/config/samples/podspec_cr.yaml b/config/samples/podspec_cr.yaml
@@ -6,7 +6,7 @@ metadata:
 
 spec:
   size: 2
-  image: aerospike/aerospike-server-enterprise:7.2.0.1
+  image: aerospike/aerospike-server-enterprise:8.0.0.2
 
   storage:
     filesystemVolumePolicy:
diff --git a/config/samples/rack_enabled_cluster_cr.yaml b/config/samples/rack_enabled_cluster_cr.yaml
@@ -6,7 +6,7 @@ metadata:
 
 spec:
   size: 2
-  image: aerospike/aerospike-server-enterprise:7.2.0.1
+  image: aerospike/aerospike-server-enterprise:8.0.0.2
   rackConfig:
     namespaces:
       - test
diff --git a/config/samples/sc_mode_cluster_cr.yaml b/config/samples/sc_mode_cluster_cr.yaml
@@ -6,7 +6,7 @@ metadata:
 
 spec:
   size: 4
-  image: aerospike/aerospike-server-enterprise:7.2.0.1
+  image: aerospike/aerospike-server-enterprise:8.0.0.2
 
   rosterNodeBlockList:
     - 1A0
diff --git a/config/samples/shadow_device_cluster_cr.yaml b/config/samples/shadow_device_cluster_cr.yaml
@@ -7,7 +7,7 @@ metadata:
 spec:
   # Add fields here
   size: 2
-  image: aerospike/aerospike-server-enterprise:7.2.0.1
+  image: aerospike/aerospike-server-enterprise:8.0.0.2
 
   storage:
     filesystemVolumePolicy:
diff --git a/config/samples/shadow_file_cluster_cr.yaml b/config/samples/shadow_file_cluster_cr.yaml
@@ -7,7 +7,7 @@ metadata:
 spec:
   # Add fields here
   size: 2
-  image: aerospike/aerospike-server-enterprise:7.2.0.1
+  image: aerospike/aerospike-server-enterprise:8.0.0.2
 
   storage:
     filesystemVolumePolicy:
diff --git a/config/samples/ssd_storage_cluster_cr.yaml b/config/samples/ssd_storage_cluster_cr.yaml
@@ -6,7 +6,7 @@ metadata:
 
 spec:
   size: 2
-  image: aerospike/aerospike-server-enterprise:7.2.0.1
+  image: aerospike/aerospike-server-enterprise:8.0.0.2
 
   storage:
     filesystemVolumePolicy:
diff --git a/config/samples/tls_cluster_cr.yaml b/config/samples/tls_cluster_cr.yaml
@@ -6,7 +6,7 @@ metadata:
 
 spec:
   size: 4
-  image: aerospike/aerospike-server-enterprise:7.2.0.1
+  image: aerospike/aerospike-server-enterprise:8.0.0.2
 
   storage:
     filesystemVolumePolicy:
diff --git a/config/samples/xdr_dst_cluster_cr.yaml b/config/samples/xdr_dst_cluster_cr.yaml
@@ -6,7 +6,7 @@ metadata:
 
 spec:
   size: 2
-  image: aerospike/aerospike-server-enterprise:7.2.0.1
+  image: aerospike/aerospike-server-enterprise:8.0.0.2
 
   storage:
     filesystemVolumePolicy:
diff --git a/config/samples/xdr_src_cluster_cr.yaml b/config/samples/xdr_src_cluster_cr.yaml
@@ -6,7 +6,7 @@ metadata:
 
 spec:
   size: 2
-  image: aerospike/aerospike-server-enterprise:7.2.0.1
+  image: aerospike/aerospike-server-enterprise:8.0.0.2
 
   storage:
     filesystemVolumePolicy:
diff --git a/helm-charts/aerospike-backup-service/README.md b/helm-charts/aerospike-backup-service/README.md
@@ -1,6 +1,6 @@
 # Aerospike Backup Service (Custom Resource) Helm Chart
 
-A Helm chart for `AerospikeBackupService` custom resource to be used with the Aerospike Kubernetes Operator.
+A Helm chart for `AerospikeBackupService` (ABS) custom resource to be used with the Aerospike Kubernetes Operator.
 
 ## Pre Requisites
 
@@ -18,9 +18,21 @@ helm repo update
 
 ### Deploy Aerospike Backup Service
 
+#### Prepare the namespace
+
+We recommend using one ABS deployment per Aerospike cluster.
+
+Create the service account for the ABS in the namespace where ABS is deployed
+
+```sh
+kubectl create serviceaccount aerospike-backup-service -n <namespace>
+```
+
+> Note: ServiceAccount name can be configured. Update the configured ServiceAccount in a ABS CR file to use a different service account name.
+
 #### Install the chart
 
-`<namespace>` used to install Aerospike backup service chart must be included in `watchNamespaces` value of
+`<namespace>` used to install ABS chart must be included in `watchNamespaces` value of
 aerospike-kubernetes-operator's `values.yaml`
 
 ```sh
@@ -38,22 +50,18 @@ helm install aerospike-backup-service aerospike/aerospike-backup-service \
 
 ## Configurations
 
-| Name                         | Description                                                                   | Default                              |
-|------------------------------|-------------------------------------------------------------------------------|--------------------------------------|
-| `image.repository`           | Aerospike backup service container image repository                           | `aerospike/aerospike-backup-service` |
-| `image.tag`                  | Aerospike backup service container image tag                                  | `3.0.0`                              |
-| `customLabels`               | Custom labels to add on the AerospikeBackupService resource                   | `{}` (nil)                           |
-| `serviceAccount.create`      | Enable ServiceAccount creation for Aerospike backup service.                  | true                                 |
-| `serviceAccount.annotations` | ServiceAccount annotations                                                    | `{}` (nil)                           |
-| `backupServiceConfig`        | Aerospike backup service configuration                                        | `{}` (nil)                           |
-| `secrets`                    | Secrets to be mounted in the Aerospike Backup Service pod like aws creds etc. | `[]` (nil)                           |
-| `resources`                  | Aerospike backup service pod resource requirements                            | `{}` (nil)                           |
-| `service`                    | Kubernetes service configuration for Aerospike backup service                 | `{}` (nil)                           |
-
+| Name                  | Description                                                                   | Default                              |
+|-----------------------|-------------------------------------------------------------------------------|--------------------------------------|
+| `image.repository`    | Aerospike backup service container image repository                           | `aerospike/aerospike-backup-service` |
+| `image.tag`           | Aerospike backup service container image tag                                  | `3.0.0`                              |
+| `customLabels`        | Custom labels to add on the Aerospike backup service resource                 | `{}` (nil)                           |
+| `backupServiceConfig` | Aerospike backup service configuration                                        | `{}` (nil)                           |
+| `secrets`             | Secrets to be mounted in the Aerospike backup service pod like aws creds etc. | `[]` (nil)                           |
+| `resources`           | Aerospike backup service pod resource requirements                            | `{}` (nil)                           |
+| `service`             | Kubernetes service configuration for Aerospike backup service                 | `{}` (nil)                           |
+| `podSpec`             | Aerospike backup service pod configuration                                    | `{}` (nil)                           |
 
 ### Configurations Explained
-
-[//]: # (TODO: Update below link when the documentation is available.)
 Refer
-to [AerospikeBackupService Customer Resource Spec](https://docs.aerospike.com/cloud/kubernetes/operator/cluster-configuration-settings#spec)
+to [AerospikeBackupService Customer Resource Spec](https://aerospike.com/docs/cloud/kubernetes/operator/backup-and-restore/backup-service-configuration#spec)
 for details on above [configuration fields](#Configurations)
diff --git a/helm-charts/aerospike-backup-service/values.yaml b/helm-charts/aerospike-backup-service/values.yaml
@@ -25,7 +25,6 @@ backupServiceConfig: {}
 #  backup-policies:
 #    test-policy:
 #      parallel: 3
-#      remove-files: KeepAll
 #  storage:
 #    local:
 #      local-storage:
diff --git a/helm-charts/aerospike-backup/README.md b/helm-charts/aerospike-backup/README.md
@@ -49,8 +49,6 @@ helm install aerospike-backup aerospike/aerospike-backup \
 | `onDemandBackups[*].delay`       | Delay interval before starting the on-demand backup  |            |
 
 ### Configurations Explained
-
-[//]: # (TODO: Update below link when the documentation is available.)
 Refer
-to [AerospikeBackup Customer Resource Spec](https://docs.aerospike.com/cloud/kubernetes/operator/cluster-configuration-settings#spec)
+to [AerospikeBackup Customer Resource Spec](https://aerospike.com/docs/cloud/kubernetes/operator/backup-and-restore/backup-configuration#spec)
 for details on above [configuration fields](#Configurations)
diff --git a/helm-charts/aerospike-cluster/README.md b/helm-charts/aerospike-cluster/README.md
@@ -48,7 +48,7 @@ helm install aerospike ./aerospike-cluster/ \
 | -- |---------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------|
 | `replicas` | Aerospike cluster size                                                                                                          | `3`                                                       |
 | `image.repository` | Aerospike server container image repository                                                                             | `aerospike/aerospike-server-enterprise`                   |
-| `image.tag` | Aerospike server container image tag                                                                                           | `7.2.0.1`                                                 |
+| `image.tag` | Aerospike server container image tag                                                                                           | `8.0.0.2`                                                 |
 | `imagePullSecrets` | Secrets containing credentials to pull Aerospike container image from a private registry                                | `{}` (nil)                                                |
 | `customLabels` | Custom labels to add on the aerospikecluster resource                                                                           | `{}` (nil)                                                |
 | `aerospikeAccessControl` | Aerospike access control configuration. Define users and roles to be created on the cluster.                                    | `{}` (nil)                                                |
@@ -116,4 +116,4 @@ validationPolicy:
 
 ### Configurations Explained
 
-Refer to [AerospikeCluster Customer Resource Spec](https://docs.aerospike.com/cloud/kubernetes/operator/cluster-configuration-settings#spec) for details on above [configuration fields](#Configurations)
+Refer to [AerospikeCluster Customer Resource Spec](https://aerospike.com/docs/cloud/kubernetes/operator/configuration/Cluster-configuration-settings#spec) for details on above [configuration fields](#Configurations)
diff --git a/helm-charts/aerospike-cluster/templates/aerospike-cluster-cr.yaml b/helm-charts/aerospike-cluster/templates/aerospike-cluster-cr.yaml
@@ -16,7 +16,7 @@ spec:
   size: {{ .Values.replicas }}
 
   # Aerospike server docker image
-  image: {{ .Values.image.repository | default "aerospike/aerospike-server-enterprise" }}:{{ .Values.image.tag | default "7.2.0.1" }}
+  image: {{ .Values.image.repository | default "aerospike/aerospike-server-enterprise" }}:{{ .Values.image.tag | default "8.0.0.2" }}
 
   ## maxUnavailable defines percentage/number of pods that can be allowed to go down or unavailable
   ## before application disruption.
diff --git a/helm-charts/aerospike-cluster/values.yaml b/helm-charts/aerospike-cluster/values.yaml
@@ -8,7 +8,7 @@ replicas: 3
 ## Aerospike server docker image
 image:
   repository: aerospike/aerospike-server-enterprise
-  tag: 7.2.0.1
+  tag: 8.0.0.2
 
 ## In case the above image is pulled from a registry that requires
 ## authentication, a secret containing credentials can be added
diff --git a/helm-charts/aerospike-kubernetes-operator/templates/aerospike-operator-manager-clusterrole.yaml b/helm-charts/aerospike-kubernetes-operator/templates/aerospike-operator-manager-clusterrole.yaml
@@ -91,6 +91,7 @@ rules:
   - get
   - list
   - watch
+  - update
 - apiGroups:
   - ""
   resources:
diff --git a/helm-charts/aerospike-restore/README.md b/helm-charts/aerospike-restore/README.md
@@ -48,8 +48,6 @@ helm install aerospike-restore aerospike/aerospike-restore \
 | `pollingPeriod`      | Polling period for restore operation status                          | `60s`      |
 
 ### Configurations Explained
-
-[//]: # (TODO: Update below link when the documentation is available.)
 Refer
-to [AerospikeRestore Customer Resource Spec](https://docs.aerospike.com/cloud/kubernetes/operator/cluster-configuration-settings#spec)
+to [AerospikeRestore Customer Resource Spec](https://aerospike.com/docs/cloud/kubernetes/operator/backup-and-restore/restore-configuration#spec)
 for details on above [configuration fields](#Configurations)
diff --git a/internal/controller/backup-service/reconciler.go b/internal/controller/backup-service/reconciler.go
diff --git a/internal/controller/backup/reconciler.go b/internal/controller/backup/reconciler.go
diff --git a/internal/controller/cluster/aerospikecluster_controller.go b/internal/controller/cluster/aerospikecluster_controller.go
diff --git a/internal/controller/common/backup_config_util.go b/internal/controller/common/backup_config_util.go
diff --git a/internal/controller/restore/reconciler.go b/internal/controller/restore/reconciler.go
diff --git a/pkg/configschema/schemas b/pkg/configschema/schemas
diff --git a/test/cluster/cluster_helper.go b/test/cluster/cluster_helper.go

-Original file line number
+Diff line change
   - delete
   - get
   - list
 +  - update
   - watch
 - apiGroups:
   - ""