Address review comments

k8ssandra · May 23, 2024 · a7e9fce · a7e9fce
1 parent a9716c5
commit a7e9fce
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/apis/k8ssandra/v1alpha1/k8ssandracluster_types.go b/apis/k8ssandra/v1alpha1/k8ssandracluster_types.go
@@ -319,6 +319,7 @@ type DatacenterOptions struct {
 	// - Cassandra: 3.11.X, 4.X.X and 5.X.X
 	// - DSE: 6.8.X, 7.x.x
 	// - HCD: 1.0.x
+	// +kubebuilder:validation:Pattern=(\d+\.\d+\.\d+)
 	ServerVersion string `json:"serverVersion,omitempty"`
 
 	// ServerImage is the image for the cassandra container. Note that this should be a
@@ -545,9 +546,6 @@ func (kc *K8ssandraCluster) DefaultNumTokens(serverVersion *semver.Version) floa
 	if kc.Spec.Cassandra.ServerType.IsCassandra() && serverVersion.Major() == 3 {
 		return float64(256)
 	}
-	if kc.Spec.Cassandra.ServerType.IsCassandra() {
-		return float64(8)
-	}
 	return float64(16)
 }
 

diff --git a/charts/k8ssandra-operator/crds/k8ssandra-operator-crds.yaml b/charts/k8ssandra-operator/crds/k8ssandra-operator-crds.yaml
@@ -10740,6 +10740,7 @@ spec:
                             - Cassandra: 3.11.X, 4.X.X and 5.X.X
                             - DSE: 6.8.X, 7.x.x
                             - HCD: 1.0.x
+                          pattern: (\d+\.\d+\.\d+)
                           type: string
                         serviceAccount:
                           description: The k8s service account to use for the Cassandra
@@ -23265,6 +23266,7 @@ spec:
                       - Cassandra: 3.11.X, 4.X.X and 5.X.X
                       - DSE: 6.8.X, 7.x.x
                       - HCD: 1.0.x
+                    pattern: (\d+\.\d+\.\d+)
                     type: string
                   serviceAccount:
                     description: The k8s service account to use for the Cassandra

diff --git a/config/crd/bases/k8ssandra.io_k8ssandraclusters.yaml b/config/crd/bases/k8ssandra.io_k8ssandraclusters.yaml
@@ -10678,6 +10678,7 @@ spec:
                             - Cassandra: 3.11.X, 4.X.X and 5.X.X
                             - DSE: 6.8.X, 7.x.x
                             - HCD: 1.0.x
+                          pattern: (\d+\.\d+\.\d+)
                           type: string
                         serviceAccount:
                           description: The k8s service account to use for the Cassandra
@@ -23203,6 +23204,7 @@ spec:
                       - Cassandra: 3.11.X, 4.X.X and 5.X.X
                       - DSE: 6.8.X, 7.x.x
                       - HCD: 1.0.x
+                    pattern: (\d+\.\d+\.\d+)
                     type: string
                   serviceAccount:
                     description: The k8s service account to use for the Cassandra