Add cluster size validation rule (#230)

* cluster size validation rule * mockery update * Add validation test case * Set rule only for size integer value * Improve test names * Improve validation message
kyma-project · Nov 21, 2023 · 0940701 · 0940701
1 parent b77368d
commit 0940701
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 49 deletions.
diff --git a/api/v1alpha1/nats_types.go b/api/v1alpha1/nats_types.go
@@ -125,6 +125,7 @@ type Cluster struct {
 	// +kubebuilder:default:=3
 	// +kubebuilder:validation:Minimum:=1
 	// +kubebuilder:validation:XValidation:rule="(self%2) != 0", message="size only accepts odd numbers"
+	// +kubebuilder:validation:XValidation:rule="!(oldSelf > 1 && self == 1)", message="cannot be set to 1 if size was greater than 1"
 	Size int `json:"size,omitempty"`
 }
 

diff --git a/config/crd/bases/operator.kyma-project.io_nats.yaml b/config/crd/bases/operator.kyma-project.io_nats.yaml
@@ -83,6 +83,8 @@ spec:
                     x-kubernetes-validations:
                     - message: size only accepts odd numbers
                       rule: (self%2) != 0
+                    - message: cannot be set to 1 if size was greater than 1
+                      rule: '!(oldSelf > 1 && self == 1)'
                 type: object
               jetStream:
                 default:

diff --git a/internal/controller/nats/integrationtests/validation/integration_test.go b/internal/controller/nats/integrationtests/validation/integration_test.go
@@ -267,6 +267,37 @@ func Test_Validate_UpdateNATS(t *testing.T) {
 			},
 			wantErrMsg: "fileStorage is immutable once it was set",
 		},
+		{
+			name: `validation of cluster fails, if cluster.size was set to a value >1 and now gets reduced to 1'`,
+			givenNATS: testutils.NewNATSCR(
+				testutils.WithNATSCluster(defaultCluster()),
+			),
+			wantMatches: gomega.And(
+				natsmatchers.HaveSpecCluster(defaultCluster()),
+			),
+			givenUpdates: []testutils.NATSOption{
+				testutils.WithNATSCluster(v1alpha1.Cluster{
+					Size: 1,
+				}),
+			},
+			wantErrMsg: "cannot be set to 1 if size was greater than 1",
+		},
+		{
+			name: `validation of cluster passes, if cluster.size was set to a value >1
+			and now gets set to another value >1'`,
+			givenNATS: testutils.NewNATSCR(
+				testutils.WithNATSCluster(defaultCluster()),
+			),
+			wantMatches: gomega.And(
+				natsmatchers.HaveSpecCluster(defaultCluster()),
+			),
+			givenUpdates: []testutils.NATSOption{
+				testutils.WithNATSCluster(v1alpha1.Cluster{
+					Size: 5,
+				}),
+			},
+			wantErrMsg: noError,
+		},
 	}
 
 	for _, tc := range testCases {

diff --git a/internal/controller/nats/mocks/controller.go b/internal/controller/nats/mocks/controller.go
diff --git a/internal/controller/nats/mocks/manager.go b/internal/controller/nats/mocks/manager.go
diff --git a/pkg/k8s/chart/mocks/renderer.go b/pkg/k8s/chart/mocks/renderer.go
diff --git a/pkg/k8s/mocks/client.go b/pkg/k8s/mocks/client.go
diff --git a/pkg/manager/mocks/manager.go b/pkg/manager/mocks/manager.go
diff --git a/pkg/nats/mocks/client.go b/pkg/nats/mocks/client.go
diff --git a/testutils/options.go b/testutils/options.go
@@ -210,6 +210,13 @@ func WithNATSFileStorage(fileStorage v1alpha1.FileStorage) NATSOption {
 	}
 }
 
+func WithNATSCluster(cluster v1alpha1.Cluster) NATSOption {
+	return func(nats *v1alpha1.NATS) error {
+		nats.Spec.Cluster = cluster
+		return nil
+	}
+}
+
 func WithNATSLabels(labels map[string]string) NATSOption {
 	return func(nats *v1alpha1.NATS) error {
 		nats.Spec.Labels = labels