validation for KafkaSpec fields while update was added, redis DC vali…

…dations was fixed
instaclustr · Jul 18, 2023 · 8f5d179 · 8f5d179
1 parent 4574689
commit 8f5d179
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 36 deletions.
diff --git a/apis/clusters/v1beta1/kafka_webhook.go b/apis/clusters/v1beta1/kafka_webhook.go
@@ -312,23 +312,31 @@ type immutableKafkaFields struct {
 }
 
 type specificKafkaFields struct {
-	replicationFactor         int
-	partitionsNumber          int
-	allowDeleteTopics         bool
-	autoCreateTopics          bool
-	clientToClusterEncryption bool
-	bundledUseOnly            bool
+	replicationFactor                 int
+	partitionsNumber                  int
+	allowDeleteTopics                 bool
+	autoCreateTopics                  bool
+	clientToClusterEncryption         bool
+	bundledUseOnly                    bool
+	privateNetworkCluster             bool
+	clientAuthBrokerWithEncryption    bool
+	clientAuthBrokerWithoutEncryption bool
+	clientBrokerAuthWithMtls          bool
 }
 
 func (ks *KafkaSpec) newKafkaImmutableFields() *immutableKafkaFields {
 	return &immutableKafkaFields{
 		specificFields: specificKafkaFields{
-			replicationFactor:         ks.ReplicationFactor,
-			partitionsNumber:          ks.PartitionsNumber,
-			allowDeleteTopics:         ks.AllowDeleteTopics,
-			autoCreateTopics:          ks.AutoCreateTopics,
-			clientToClusterEncryption: ks.ClientToClusterEncryption,
-			bundledUseOnly:            ks.BundledUseOnly,
+			replicationFactor:                 ks.ReplicationFactor,
+			partitionsNumber:                  ks.PartitionsNumber,
+			allowDeleteTopics:                 ks.AllowDeleteTopics,
+			autoCreateTopics:                  ks.AutoCreateTopics,
+			clientToClusterEncryption:         ks.ClientToClusterEncryption,
+			bundledUseOnly:                    ks.BundledUseOnly,
+			privateNetworkCluster:             ks.PrivateNetworkCluster,
+			clientAuthBrokerWithEncryption:    ks.ClientAuthBrokerWithEncryption,
+			clientAuthBrokerWithoutEncryption: ks.ClientAuthBrokerWithoutEncryption,
+			clientBrokerAuthWithMtls:          ks.ClientBrokerAuthWithMTLS,
 		},
 		cluster: ks.Cluster.newImmutableFields(),
 	}

diff --git a/apis/clusters/v1beta1/redis_types.go b/apis/clusters/v1beta1/redis_types.go
@@ -308,24 +308,30 @@ func (rs *RedisSpec) validateDCsUpdate(oldSpec RedisSpec) error {
 		return models.ErrDecreasedDataCentresNumber
 	}
 
-	for i, oldDC := range oldSpec.DataCentres {
-		newDC := oldSpec.DataCentres[i]
-		newDCImmutableFields := newDC.newImmutableFields()
-		oldDCImmutableFields := oldDC.newImmutableFields()
-
-		if *newDCImmutableFields != *oldDCImmutableFields {
-			return fmt.Errorf("cannot update immutable data centre fields: new spec: %v: old spec: %v", newDCImmutableFields, oldDCImmutableFields)
-		}
-
-		err := newDC.validateImmutableCloudProviderSettingsUpdate(oldDC.CloudProviderSettings)
-		if err != nil {
-			return err
-		}
-
-		if newDC.NodesNumber < oldDC.NodesNumber {
-			return fmt.Errorf("deleting nodes is not supported. Number of nodes must be greater than: %v", oldDC.NodesNumber)
+	for _, newDC := range rs.DataCentres {
+		for _, oldDC := range oldSpec.DataCentres {
+			if newDC.Name == oldDC.Name {
+				newDCImmutableFields := newDC.newImmutableFields()
+				oldDCImmutableFields := oldDC.newImmutableFields()
+
+				if *newDCImmutableFields != *oldDCImmutableFields {
+					return fmt.Errorf("cannot update immutable data centre fields: new spec: %v: old spec: %v", newDCImmutableFields, oldDCImmutableFields)
+				}
+
+				err := newDC.validateImmutableCloudProviderSettingsUpdate(oldDC.CloudProviderSettings)
+				if err != nil {
+					return err
+				}
+
+				if newDC.MasterNodes < oldDC.MasterNodes {
+					return fmt.Errorf("deleting nodes is not supported. Number of nodes must be greater than: %v", oldDC.NodesNumber)
+				}
+
+				if newDC.NodesNumber < oldDC.NodesNumber {
+					return fmt.Errorf("deleting nodes is not supported. Number of nodes must be greater than: %v", oldDC.NodesNumber)
+				}
+			}
 		}
-
 	}
 
 	for i := len(oldSpec.DataCentres); i < len(rs.DataCentres); i++ {

diff --git a/apis/clusters/v1beta1/redis_webhook.go b/apis/clusters/v1beta1/redis_webhook.go
@@ -122,7 +122,6 @@ func (rv *redisValidator) ValidateUpdate(ctx context.Context, old runtime.Object
 	if r.Annotations[models.ExternalChangesAnnotation] == models.True {
 		return nil
 	}
-
 	oldRedis, ok := old.(*Redis)
 	if !ok {
 		return models.ErrTypeAssertion

diff --git a/config/samples/clusterresources_v1beta1_clusterbackup.yaml b/config/samples/clusterresources_v1beta1_clusterbackup.yaml
@@ -3,5 +3,5 @@ kind: ClusterBackup
 metadata:
   name: clusterbackup-sample
 spec:
-  clusterId: b3eb2b51-1b89-45a1-906d-10cf340c7bd7
+  clusterId: 2ae611cf-ac91-4325-941c-a35c043f9c34
   clusterKind: PostgreSQl
diff --git a/config/samples/clusterresources_v1beta1_maintenanceevents.yaml b/config/samples/clusterresources_v1beta1_maintenanceevents.yaml
@@ -3,7 +3,7 @@ kind: MaintenanceEvents
 metadata:
   name: maintenanceevents-sample
 spec:
-  clusterId: "917062a6-a449-4527-a3aa-e3904b04b39f"
+  clusterId: "2ae611cf-ac91-4325-941c-a35c043f9c34"
   exclusionWindows:
     - dayOfWeek: "MONDAY"
       startHour: 1

diff --git a/config/samples/clusterresources_v1beta1_nodereload.yaml b/config/samples/clusterresources_v1beta1_nodereload.yaml
@@ -4,5 +4,5 @@ metadata:
   name: nodereload-sample
 spec:
   nodes:
-    - nodeID: "ac3c5fbd-ffa1-4a73-8b7a-74b68b464a1b"
-    - nodeID: "4234f82b-aef0-46f1-b52c-d4f4a1139268"
+    - nodeID: "8b5e3cb1-d1ca-400c-92e5-3279a79133a2"
+    - nodeID: "8de5f5ad-d776-4c19-a322-1efffe149018"
diff --git a/config/samples/clusters_v1beta1_redis.yaml b/config/samples/clusters_v1beta1_redis.yaml
@@ -30,7 +30,7 @@ spec:
       #      nodeSize: "t3.medium-80-r"
       nodeSize: "t3.small-20-r"
       masterNodes: 3
-      nodesNumber: 0
+      nodesNumber: 3
 #    - region: "US_WEST_2"
 #      name: "testDC2"
 #      cloudProvider: "AWS_VPC"

diff --git a/controllers/clusterresources/maintenanceevents_controller.go b/controllers/clusterresources/maintenanceevents_controller.go
@@ -193,7 +193,7 @@ func (r *MaintenanceEventsReconciler) Reconcile(ctx context.Context, req ctrl.Re
 
 	r.EventRecorder.Eventf(
 		me, models.Normal, models.Created,
-		"Cluster backups check job is started",
+		"Cluster maintenance events check job is started",
 	)
 
 	l.Info("Maintenance Event resource was reconciled",