Update to cass-operator v1.18.1 (#1104)

k8ssandra · Oct 26, 2023 · 7725008 · 7725008
1 parent 2d9fa72
commit 7725008
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 23 deletions.
diff --git a/CHANGELOG/CHANGELOG-1.10.md b/CHANGELOG/CHANGELOG-1.10.md
@@ -17,6 +17,7 @@ When cutting a new release, update the `unreleased` heading to the tag being gen
 
 * [CHANGE] Upgrade Reaper to v3.4.0
 * [CHANGE] [#1088](https://github.com/k8ssandra/k8ssandra-operator/issues/1088) Use the Scarf proxy for image coordinates
+* [CHANGE] Update to cass-operator v1.18.1
 * [ENHANCEMENT] [#1073](https://github.com/k8ssandra/k8ssandra-operator/issues/1073) Add a namespace label to the Cassandra metrics 
 * [BUGFIX] [#1060](https://github.com/k8ssandra/k8ssandra-operator/issues/1060) Fix restore mapping shuffling nodes when restoring in place
 * [BUGFIX] [#1061](https://github.com/k8ssandra/k8ssandra-operator/issues/1061) Point to cass-config-builder 1.0.7 for arm64 compatibility

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.44.1
+    version: 0.45.0
     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,13 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-- github.com/k8ssandra/cass-operator/config/deployments/cluster?ref=master
+- github.com/k8ssandra/cass-operator/config/deployments/cluster?ref=v1.18.1
 
 components:
   - ../../components/cass-operator-image-config
-
-# TODO: remove these image changes before release so that they don't pull a dev release of cass-operator.
-# This is required when a new feature of cass-operator is needed that is not yet released.
-images:
-- name: k8ssandra/cass-operator
-  newTag: v1.18.0-dev.5189beb-20231020
diff --git a/config/cass-operator/ns-scoped/kustomization.yaml b/config/cass-operator/ns-scoped/kustomization.yaml
@@ -2,13 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-- github.com/k8ssandra/cass-operator/config/deployments/default?ref=master
+- github.com/k8ssandra/cass-operator/config/deployments/default?ref=v1.18.1
 
 components:
   - ../../components/cass-operator-image-config
-
-# TODO: remove these image changes before release so that they don't pull a dev release of cass-operator.
-# This is required when a new feature of cass-operator is needed that is not yet released.
-images:
-- name: k8ssandra/cass-operator
-  newTag: v1.18.0-dev.5189beb-20231020
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.17.2"
+  system-logger: "k8ssandra/system-logger:v1.18.1"
   config-builder: "datastax/cass-config-builder:1.0.7"
-  k8ssandra-client: "k8ssandra/k8ssandra-client:v0.2.0"
+  k8ssandra-client: "k8ssandra/k8ssandra-client:v0.2.1"
   # cassandra:
   #   "4.0.0": "k8ssandra/cassandra-ubi:latest"
   # dse:
@@ -19,4 +19,5 @@ defaults:
   cassandra:
     repository: "k8ssandra/cass-management-api"
   dse:
-    repository: "datastax/dse-mgmtapi-6_8"
+    repository: "datastax/dse-mgmtapi-6_8"
+    suffix: "-ubi8"
diff --git a/go.mod b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/go-logr/zapr v1.2.3
 	github.com/google/uuid v1.3.0
 	github.com/gruntwork-io/terratest v0.37.7
-	github.com/k8ssandra/cass-operator v1.17.3-0.20231020160518-5189bebc9531
+	github.com/k8ssandra/cass-operator v1.18.1
 	github.com/k8ssandra/reaper-client-go v0.3.1-0.20220114183114-6923e077c4f5
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.52.1

diff --git a/go.sum b/go.sum
@@ -653,8 +653,8 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
-github.com/k8ssandra/cass-operator v1.17.3-0.20231020160518-5189bebc9531 h1:plGB8EBK8jEpbphiCkmNJNktjZwrTRlA2WzBTxEY9pU=
-github.com/k8ssandra/cass-operator v1.17.3-0.20231020160518-5189bebc9531/go.mod h1:8gYoASfrQYiDmvfMAeYSe31dO1qVe8uIISJeVXGFSiI=
+github.com/k8ssandra/cass-operator v1.18.1 h1:5EzHuIIdoka92ysId0bgpM0KSn532k6+XS0Srvvv0bE=
+github.com/k8ssandra/cass-operator v1.18.1/go.mod h1:8gYoASfrQYiDmvfMAeYSe31dO1qVe8uIISJeVXGFSiI=
 github.com/k8ssandra/reaper-client-go v0.3.1-0.20220114183114-6923e077c4f5 h1:Dq0VdM960G3AbhYwFuaebmsE08IzOYHYhngUfDmWaAc=
 github.com/k8ssandra/reaper-client-go v0.3.1-0.20220114183114-6923e077c4f5/go.mod h1:WsQymIaVT39xbcstZhdqynUS13AGzP2p6U9Hsk1oy5M=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=

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.17.2"
+	cassOperatorVersion       = "v1.18.1"
 	prometheusOperatorVersion = "v0.9.0"
 )
 

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.17.2
+        - image: k8ssandra/system-logger:v1.18.1
           name: server-system-logger
 status:
   readyReplicas: 1