checking aerospikeConf annotation availability in pod

aerospike · May 7, 2024 · 0baff72 · 0baff72
1 parent cb07826
commit 0baff72
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/api/v1/aerospikecluster_validating_webhook.go b/api/v1/aerospikecluster_validating_webhook.go
@@ -1265,7 +1265,7 @@ func validateSecurityConfigUpdate(
 		}
 
 		if currentSecurityConfig && !desiredSecurityConfig {
-			return fmt.Errorf("cannot disable security in running cluster")
+			return fmt.Errorf("cannot disable cluster security in running cluster")
 		}
 	}
 

diff --git a/controllers/reconciler.go b/controllers/reconciler.go
@@ -1063,7 +1063,7 @@ func (r *SingleClusterReconciler) handleEnableDynamicConfig() error {
 
 		for idx := range pods.Items {
 			pod := &pods.Items[idx]
-			if pod.Annotations == nil {
+			if _, ok := pod.Annotations["aerospikeConf"]; !ok {
 				if err := r.updateAerospikeConfInPod(pod.Name); err != nil {
 					return err
 				}
-Original file line number
+Diff line change
@@ Expand Up / @@ -1265,7 +1265,7 @@ func validateSecurityConfigUpdate( @@
     		}
     		if currentSecurityConfig && !desiredSecurityConfig {
-    			return fmt.Errorf("cannot disable security in running cluster")
+    			return fmt.Errorf("cannot disable cluster security in running cluster")
     		}
     	}
@@ Expand Down @@