bug fix

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

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/api/v1/aerospikecluster_validating_webhook.go b/api/v1/aerospikecluster_validating_webhook.go
@@ -1341,7 +1341,7 @@ func validateSecurityContext(
 	if !ivflag && ovflag {
 		isSecurityEnabledPodExist, err := isSecurityEnabledPodExist(podStatus)
 		if err != nil {
-			return fmt.Errorf("cannot disable cluster security in running cluster, %s", err.Error())
+			return fmt.Errorf("cannot disable cluster security, %s", err.Error())
 		}
 
 		if isSecurityEnabledPodExist {
@@ -1353,8 +1353,8 @@ func validateSecurityContext(
 }
 
 func isSecurityEnabledPodExist(podStatus map[string]AerospikePodStatus) (bool, error) {
-	if podStatus == nil {
-		return false, fmt.Errorf("podStatus is nil")
+	if len(podStatus) == 0 {
+		return false, fmt.Errorf("pod status is unknown")
 	}
 
 	for pod := range podStatus {

diff --git a/controllers/configmap.go b/controllers/configmap.go
@@ -144,6 +144,10 @@ func (r *SingleClusterReconciler) createConfigMapData(rack *asdbv1.Rack) (
 		string(podSpecStr), "\"aerospikeInitContainer\":{},", "",
 	))
 
+	podSpecStr = []byte(strings.ReplaceAll(
+		string(podSpecStr), "\"multiPodPerHost\":false,", "",
+	))
+
 	podSpecHash, err := utils.GetHash(string(podSpecStr))
 	if err != nil {
 		return nil, err