Incorporated review comments

api/v1/aerospikecluster_validating_webhook.go

@@ -19,7 +19,6 @@ package v1
 import (
 	"crypto/x509"
 	"encoding/pem"
-	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -37,7 +36,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
-	internalerrors "github.com/aerospike/aerospike-kubernetes-operator/errors"
 	lib "github.com/aerospike/aerospike-management-lib"
 	"github.com/aerospike/aerospike-management-lib/asconfig"
 )
@@ -680,12 +678,12 @@ func getNsConfForNamespaces(rackConfig RackConfig) map[string]nsConf {
 
 // TODO: This should be version specific and part of management lib.
 // max cluster size for 5.0+ cluster
-const maxEnterpriseClusterSzGt5_0 = 256
+const maxEnterpriseClusterSize = 256
 
 func validateClusterSize(_ logr.Logger, sz int) error {
-	if sz > maxEnterpriseClusterSzGt5_0 {
+	if sz > maxEnterpriseClusterSize {
 		return fmt.Errorf(
-			"cluster size cannot be more than %d", maxEnterpriseClusterSzGt5_0,
+			"cluster size cannot be more than %d", maxEnterpriseClusterSize,
 		)
 	}
 
@@ -1274,20 +1272,16 @@ func validateSecurityConfigUpdate(newSpec, oldSpec, currentStatus *AerospikeConf
 func validateSecurityContext(newSpec, oldSpec *AerospikeConfigSpec) error {
 	ovflag, err := IsSecurityEnabled(oldSpec)
 	if err != nil {
-		if !errors.Is(err, internalerrors.ErrNotFound) {
-			return fmt.Errorf(
-				"failed to validate Security context of old aerospike conf: %w", err,
-			)
-		}
+		return fmt.Errorf(
+			"failed to validate Security context of old aerospike conf: %w", err,
+		)
 	}
 
 	ivflag, err := IsSecurityEnabled(newSpec)
 	if err != nil {
-		if !errors.Is(err, internalerrors.ErrNotFound) {
-			return fmt.Errorf(
-				"failed to validate Security context of new aerospike conf: %w", err,
-			)
-		}
+		return fmt.Errorf(
+			"failed to validate Security context of new aerospike conf: %w", err,
+		)
 	}
 
 	if !ivflag && ovflag {

internal/controller/cluster/pod.go

@@ -117,26 +117,16 @@ func (r *SingleClusterReconciler) getRollingRestartTypeMap(rackState *RackState,
 				return nil, nil, err
 			}
 
-			v, err := lib.CompareVersions(version, "6.0.0")
-			if err != nil {
-				return nil, nil, err
-			}
-
-			// If version >= 6.0.0, then we can update config dynamically.
-			if v >= 0 {
-				// If EnableDynamicConfigUpdate is set and dynamic config command exec partially failed in previous try
-				// then skip dynamic config update and fall back to rolling restart.
-				// Continue with dynamic config update in case of Failed DynamicConfigUpdateStatus
-				if asdbv1.GetBool(r.aeroCluster.Spec.EnableDynamicConfigUpdate) &&
-					podStatus.DynamicConfigUpdateStatus != asdbv1.PartiallyFailed {
-					// Fetching all dynamic config change.
-					dynamicConfDiffPerPod[pods[idx].Name], err = r.handleDynamicConfigChange(rackState, pods[idx], version)
-					if err != nil {
-						return nil, nil, err
-					}
+			// If EnableDynamicConfigUpdate is set and dynamic config command exec partially failed in previous try
+			// then skip dynamic config update and fall back to rolling restart.
+			// Continue with dynamic config update in case of Failed DynamicConfigUpdateStatus
+			if asdbv1.GetBool(r.aeroCluster.Spec.EnableDynamicConfigUpdate) &&
+				podStatus.DynamicConfigUpdateStatus != asdbv1.PartiallyFailed {
+				// Fetching all dynamic config change.
+				dynamicConfDiffPerPod[pods[idx].Name], err = r.handleDynamicConfigChange(rackState, pods[idx], version)
+				if err != nil {
+					return nil, nil, err
 				}
-			} else {
-				r.Log.Info("Dynamic config change not supported for version < 6.0.0", "currentVersion", version)
 			}
 		}