Upgrade k8ssandra-client to fix cassandra.yaml cluster name setting i…

…ssue when running 4.1+ (#1114)
k8ssandra · Nov 14, 2023 · 194d0a4 · 194d0a4
1 parent 6d4a095
commit 194d0a4
Show file tree

Hide file tree

Showing 11 changed files with 138 additions and 10 deletions.
diff --git a/.github/workflows/kind_e2e_tests.yaml b/.github/workflows/kind_e2e_tests.yaml
@@ -79,7 +79,7 @@ jobs:
         e2e_test:
           - CreateSingleDatacenterCluster
           - CreateStargateAndDatacenter
-          - CreateSingleReaper
+          - CreateSingleReaperNoHttp
           - CreateSingleReaperWStargateAndHTTP
           - CreateReaperAndDatacenter
           - CreateSingleMedusaJob

diff --git a/CHANGELOG/CHANGELOG-1.10.md b/CHANGELOG/CHANGELOG-1.10.md
@@ -15,6 +15,9 @@ When cutting a new release, update the `unreleased` heading to the tag being gen
 
 ## unreleased
 
+* [BUGFIX] [#1110](https://github.com/k8ssandra/k8ssandra-operator/issues/1110) Fix cluster name being set to "Test Cluster" when running Cassandra 4.1+
+* [CHANGE] Update to cass-operator v1.18.2
+
 ## v1.10.2 - 2023-10-30
 
 * [BUGFIX] Fix manager kustomization to use the correct coordinates for the operator image

diff --git a/charts/k8ssandra-operator/Chart.yaml b/charts/k8ssandra-operator/Chart.yaml
@@ -9,7 +9,7 @@ dependencies:
     version: 0.29.0
     repository: https://helm.k8ssandra.io
   - name: cass-operator
-    version: 0.45.0
+    version: 0.45.1
     repository: https://helm.k8ssandra.io
 home: https://github.com/k8ssandra/k8ssandra-operator
 sources:

diff --git a/config/cass-operator/cluster-scoped/kustomization.yaml b/config/cass-operator/cluster-scoped/kustomization.yaml
@@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-- github.com/k8ssandra/cass-operator/config/deployments/cluster?ref=v1.18.1
+- github.com/k8ssandra/cass-operator/config/deployments/cluster?ref=v1.18.2
 
 components:
   - ../../components/cass-operator-image-config
diff --git a/config/cass-operator/ns-scoped/kustomization.yaml b/config/cass-operator/ns-scoped/kustomization.yaml
@@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-- github.com/k8ssandra/cass-operator/config/deployments/default?ref=v1.18.1
+- github.com/k8ssandra/cass-operator/config/deployments/default?ref=v1.18.2
 
 components:
   - ../../components/cass-operator-image-config
diff --git a/config/components/cass-operator-image-config/image_config.yaml b/config/components/cass-operator-image-config/image_config.yaml
@@ -3,9 +3,9 @@ kind: ImageConfig
 metadata:
   name: image-config
 images:
-  system-logger: "k8ssandra/system-logger:v1.18.1"
+  system-logger: "k8ssandra/system-logger:v1.18.2"
   config-builder: "datastax/cass-config-builder:1.0.7"
-  k8ssandra-client: "k8ssandra/k8ssandra-client:v0.2.1"
+  k8ssandra-client: "k8ssandra/k8ssandra-client:v0.2.2"
   # cassandra:
   #   "4.0.0": "k8ssandra/cassandra-ubi:latest"
   # dse:

diff --git a/go.sum b/go.sum
diff --git a/pkg/test/testenv.go b/pkg/test/testenv.go
@@ -45,7 +45,7 @@ import (
 const (
 	clustersToCreate          = 3
 	clusterProtoName          = "cluster-%d-%s"
-	cassOperatorVersion       = "v1.18.1"
+	cassOperatorVersion       = "v1.18.2"
 	prometheusOperatorVersion = "v0.9.0"
 )
 

diff --git a/test/e2e/suite_test.go b/test/e2e/suite_test.go
@@ -246,7 +246,7 @@ func TestOperator(t *testing.T) {
 		testFunc: checkStargateApisWithMultiDcCluster,
 		fixture:  framework.NewTestFixture("multi-dc-stargate", controlPlane),
 	}))
-	t.Run("CreateSingleReaper", e2eTest(ctx, &e2eTestOpts{
+	t.Run("CreateSingleReaperNoHttp", e2eTest(ctx, &e2eTestOpts{
 		testFunc:                     createSingleReaper,
 		fixture:                      framework.NewTestFixture("single-dc-reaper", controlPlane),
 		skipK8ssandraClusterCleanup:  false,

diff --git a/test/kuttl/test-servicemonitors/03-assert.yaml b/test/kuttl/test-servicemonitors/03-assert.yaml
@@ -33,7 +33,7 @@ spec:
             - name: DSE_MGMT_EXPLICIT_START
               value: "true"
           name: cassandra
-        - image: k8ssandra/system-logger:v1.18.1
+        - image: k8ssandra/system-logger:v1.18.2
           name: server-system-logger
 status:
   readyReplicas: 1

diff --git a/test/testdata/fixtures/single-dc-reaper/k8ssandra.yaml b/test/testdata/fixtures/single-dc-reaper/k8ssandra.yaml
@@ -20,7 +20,7 @@ spec:
             cpu: 100m
             memory: 512Mi
   cassandra:
-    serverVersion: "3.11.14"
+    serverVersion: "4.1.2"
     jmxInitContainerImage:
       repository: library
       name: busybox