Update k8ssandra-client image to the real one, update some tests to m…

…ake them work better with 4.1.2
k8ssandra · Jul 26, 2023 · e4d3acd · e4d3acd
1 parent 1867891
commit e4d3acd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/config/manager/image_config.yaml b/config/manager/image_config.yaml
@@ -5,7 +5,7 @@ metadata:
 images:
   system-logger: "k8ssandra/system-logger:latest"
   config-builder: "datastax/cass-config-builder:1.0-ubi7"
-  k8ssandra-client: "michaelburman290/k8ssandra-client:v0.2.0-dev.cfda014-20230724"
+  k8ssandra-client: "k8ssandra/k8ssandra-client:bee01ccf"
   # cassandra:
   #   "4.0.0": "k8ssandra/cassandra-ubi:latest"
   # dse:

diff --git a/tests/config_change/config_change_suite_test.go b/tests/config_change/config_change_suite_test.go
@@ -84,7 +84,7 @@ var _ = Describe(testName, func() {
 			ns.WaitForDatacenterCondition(dcName, "Updating", string(corev1.ConditionFalse))
 
 			step = "checking that the init container got the updated config roles_validity=256000ms"
-			json = "jsonpath={.spec.initContainers[0].env[7].value}"
+			json = "jsonpath={.spec.initContainers[1].env[7].value}"
 			k = kubectl.Get(fmt.Sprintf("pod/%s-%s-r1-sts-0", clusterName, dcName)).
 				FormatOutput(json)
 			ns.WaitForOutputContainsAndLog(step, k, "\"roles_validity\":\"256000ms\"", 30)

diff --git a/tests/testdata/default-single-rack-2-node-dc-with-auth-enabled.yaml b/tests/testdata/default-single-rack-2-node-dc-with-auth-enabled.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   clusterName: cluster2
   serverType: cassandra
-  serverVersion: "3.11.10"
+  serverVersion: "4.1.2"
   managementApiAuth:
     insecure: {}
   size: 2
@@ -20,10 +20,12 @@ spec:
   racks:
     - name: r1
   config:
-    jvm-options:
+    jvm-server-options:
       initial_heap_size: "512m"
       max_heap_size: "512m"
     cassandra-yaml:
+      allocate_tokens_for_local_replication_factor: 2
+      rpc_address: "0.0.0.0"
       authenticator: PasswordAuthenticator
       authorizer: CassandraAuthorizer
       role_manager: CassandraRoleManager
diff --git a/tests/testdata/default-single-rack-2-node-dc-with-superuser-secret.yaml b/tests/testdata/default-single-rack-2-node-dc-with-superuser-secret.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   clusterName: cluster2
   serverType: cassandra
-  serverVersion: "3.11.10"
+  serverVersion: "4.1.2"
   managementApiAuth:
     insecure: {}
   size: 2
@@ -24,10 +24,12 @@ spec:
   racks:
     - name: r1
   config:
-    jvm-options:
+    jvm-server-options:
       initial_heap_size: "512m"
       max_heap_size: "512m"
     cassandra-yaml:
+      allocate_tokens_for_local_replication_factor: 2
+      rpc_address: "0.0.0.0"
       authenticator: PasswordAuthenticator
       authorizer: CassandraAuthorizer
       role_manager: CassandraRoleManager