adjust webhook test

Signed-off-by: Karol Szwaj <[email protected]>
k8ssandra · Nov 27, 2023 · 55e2646 · 55e2646
1 parent 64bf78a
commit 55e2646
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/apis/k8ssandra/v1alpha1/k8ssandracluster_webhook.go b/apis/k8ssandra/v1alpha1/k8ssandracluster_webhook.go
@@ -117,15 +117,15 @@ func (r *K8ssandraCluster) ValidateUpdate(old runtime.Object) error {
 	newCassConfig := r.Spec.Cassandra.DatacenterOptions.CassandraConfig
 	if oldCassConfig != nil && newCassConfig != nil {
 		oldNumTokens, oldNumTokensExists := oldCassConfig.CassandraYaml["num_tokens"]
-		newNumTokens := newCassConfig.CassandraYaml["num_tokens"]
+		newNumTokens, newNumTokensExists := newCassConfig.CassandraYaml["num_tokens"]
 
 		if !oldNumTokensExists {
 			cassVersion, err := semver.NewVersion(oldCluster.Spec.Cassandra.ServerVersion)
 			if err != nil {
 				return err
 			}
 			defaultNumTokens := oldCluster.DefaultNumTokens(cassVersion)
-			if int64(newNumTokens.(float64)) != defaultNumTokens {
+			if newNumTokensExists && int64(newNumTokens.(float64)) != defaultNumTokens {
 				return ErrNumTokens
 			}
 		} else {

diff --git a/apis/k8ssandra/v1alpha1/k8ssandracluster_webhook_test.go b/apis/k8ssandra/v1alpha1/k8ssandracluster_webhook_test.go
@@ -176,17 +176,6 @@ func testNumTokensInUpdate(t *testing.T) {
 	// This should be acceptable change, since 3.11.10 defaulted to 256 and so it is the same value
 	err = k8sClient.Update(ctx, cluster)
 	require.NoError(err)
-
-	// However, not setting the num_tokens, when the defaults have changed should be rejected - otherwise the cluster will reject the update
-	cluster2 := createMinimalClusterObj("numtokens-test-update-2", "numtokensupdate-namespace")
-	cluster2.Spec.Cassandra.ServerVersion = "3.11.10"
-	cluster2.Spec.Cassandra.DatacenterOptions.CassandraConfig = &CassandraConfig{}
-	err = k8sClient.Create(ctx, cluster2)
-	require.NoError(err)
-
-	cluster2.Spec.Cassandra.ServerVersion = "4.1.3"
-	err = k8sClient.Update(ctx, cluster2)
-	require.Error(err)
 }
 
 func testReaperKeyspaceValidation(t *testing.T) {