From a9ff56b547feee3b2fa8599782650032d433a366 Mon Sep 17 00:00:00 2001 From: Karol Szwaj Date: Tue, 21 Nov 2023 11:09:02 +0100 Subject: [PATCH] fix: skip validation of num_tokens when upgrading from 3.x to 4.x Signed-off-by: Karol Szwaj --- pkg/cassandra/datacenter.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/cassandra/datacenter.go b/pkg/cassandra/datacenter.go index 7f375d38c..f9dc52e57 100644 --- a/pkg/cassandra/datacenter.go +++ b/pkg/cassandra/datacenter.go @@ -2,6 +2,7 @@ package cassandra import ( "fmt" + "strings" "github.com/Masterminds/semver/v3" "github.com/k8ssandra/cass-operator/apis/cassandra/v1beta1" @@ -507,6 +508,11 @@ func ValidateConfig(desiredDc, actualDc *cassdcapi.CassandraDatacenter) error { return err } + // Skip validation if upgrading from 3.x to 4.x, num_tokens defaults were changed + if strings.HasPrefix(actualDc.Spec.ServerVersion, "3.") && strings.HasPrefix(desiredDc.Spec.ServerVersion, "4.") { + return nil + } + actualCassYaml, foundActualYaml := actualConfig["cassandra-yaml"].(map[string]interface{}) desiredCassYaml, foundDesiredYaml := desiredConfig["cassandra-yaml"].(map[string]interface{})