From 87bed5f4bef6269a51fe632a75831c3f45b84dec Mon Sep 17 00:00:00 2001 From: Michael Burman Date: Thu, 30 May 2024 15:26:43 +0300 Subject: [PATCH] Update cass-operator to v1.21.0 (#1335) --- CHANGELOG/CHANGELOG-1.17.md | 1 + charts/k8ssandra-operator/Chart.yaml | 2 +- .../cluster-scoped/kustomization.yaml | 2 +- .../ns-scoped/kustomization.yaml | 2 +- .../image_config.yaml | 23 ------------------- .../kustomization.yaml | 8 ------- docs/content/en/contribute/_index.md | 6 ++--- go.mod | 2 +- go.sum | 4 ++-- pkg/test/testenv.go | 2 +- 10 files changed, 11 insertions(+), 41 deletions(-) delete mode 100644 config/components/cass-operator-image-config/image_config.yaml delete mode 100644 config/components/cass-operator-image-config/kustomization.yaml diff --git a/CHANGELOG/CHANGELOG-1.17.md b/CHANGELOG/CHANGELOG-1.17.md index 3a5eb2ecd..470adb8a9 100644 --- a/CHANGELOG/CHANGELOG-1.17.md +++ b/CHANGELOG/CHANGELOG-1.17.md @@ -15,6 +15,7 @@ When cutting a new release, update the `unreleased` heading to the tag being gen ## unreleased +* [CHANGE] []() Update cass-operator to v1.21.0 * [CHANGE] [#1313](https://github.com/k8ssandra/k8ssandra-operator/issues/1313) upgrade controller-runtime to 1.17 series, Go to 1.21. * [BUGFIX] [#1317](https://github.com/k8ssandra/k8ssandra-operator/issues/1317) Fix issues with caches in cluster scoped deployments where they were continuing to use a multi-namespace scoped cache and not an informer cache. * [BUGFIX] [#1316](https://github.com/k8ssandra/k8ssandra-operator/issues/1316) Fix interchanged intervals and timeouts in tests. diff --git a/charts/k8ssandra-operator/Chart.yaml b/charts/k8ssandra-operator/Chart.yaml index abc0090f3..462d7b457 100644 --- 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.51.0 + version: 0.52.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 index 086cda435..430215110 100644 --- a/config/cass-operator/cluster-scoped/kustomization.yaml +++ b/config/cass-operator/cluster-scoped/kustomization.yaml @@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- github.com/k8ssandra/cass-operator/config/deployments/cluster?ref=v1.20.0 +- github.com/k8ssandra/cass-operator/config/deployments/cluster?ref=v1.21.0 diff --git a/config/cass-operator/ns-scoped/kustomization.yaml b/config/cass-operator/ns-scoped/kustomization.yaml index 1a8b64439..ff0c0ebef 100644 --- a/config/cass-operator/ns-scoped/kustomization.yaml +++ b/config/cass-operator/ns-scoped/kustomization.yaml @@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- github.com/k8ssandra/cass-operator/config/deployments/default?ref=v1.20.0 +- github.com/k8ssandra/cass-operator/config/deployments/default?ref=v1.21.0 diff --git a/config/components/cass-operator-image-config/image_config.yaml b/config/components/cass-operator-image-config/image_config.yaml deleted file mode 100644 index c1526f8cb..000000000 --- a/config/components/cass-operator-image-config/image_config.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: config.k8ssandra.io/v1beta1 -kind: ImageConfig -metadata: - name: image-config -images: - system-logger: "k8ssandra/system-logger:v1.20.0" - config-builder: "datastax/cass-config-builder:1.0.7" - k8ssandra-client: "k8ssandra/k8ssandra-client:v0.2.2" - # cassandra: - # "4.0.0": "k8ssandra/cassandra-ubi:latest" - # dse: - # "6.8.999": "datastax/dse-server-prototype:latest" -# imageRegistry: "localhost:5000" -# imagePullPolicy: Always -# imagePullSecret: -# name: my-secret-pull-registry -defaults: - # Note, postfix is ignored if repository is not set - cassandra: - repository: "k8ssandra/cass-management-api" - dse: - repository: "datastax/dse-mgmtapi-6_8" - suffix: "-ubi8" diff --git a/config/components/cass-operator-image-config/kustomization.yaml b/config/components/cass-operator-image-config/kustomization.yaml deleted file mode 100644 index 4f68f4103..000000000 --- a/config/components/cass-operator-image-config/kustomization.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1alpha1 -kind: Component - -configMapGenerator: -- files: - - image_config.yaml - behavior: merge - name: manager-config \ No newline at end of file diff --git a/docs/content/en/contribute/_index.md b/docs/content/en/contribute/_index.md index 2671876ae..9dc3177b6 100644 --- a/docs/content/en/contribute/_index.md +++ b/docs/content/en/contribute/_index.md @@ -258,7 +258,7 @@ The integration test framework installs CRDs. We have to specify the version to const ( clustersToCreate = 3 clusterProtoName = "cluster-%d" - cassOperatorVersion = "v1.20.0" + cassOperatorVersion = "v1.21.0" prometheusOperatorVersion = "v0.9.0" ) ``` @@ -269,11 +269,11 @@ There are a couple of places in the Kustomize manifests that need to be updated. ```yaml resources: - ../default - - github.com/k8ssandra/cass-operator/config/deployments/default?ref=v1.20.0 + - github.com/k8ssandra/cass-operator/config/deployments/default?ref=v1.21.0 images: - name: k8ssandra/cass-operator - newTag: v1.20.0 + newTag: v1.21.0 ``` In this example the `resources` entry happens to specify a release tag. When referencing specific commits, the full hash must be specified. The images transform specifies the corresponding image tag. diff --git a/go.mod b/go.mod index e3ef59033..dfa4e0eb9 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/go-logr/zapr v1.3.0 github.com/google/uuid v1.3.0 github.com/gruntwork-io/terratest v0.37.7 - github.com/k8ssandra/cass-operator v1.20.0 + github.com/k8ssandra/cass-operator v1.21.0 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 index f10207026..10678a94b 100644 --- a/go.sum +++ b/go.sum @@ -1436,8 +1436,8 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= -github.com/k8ssandra/cass-operator v1.20.0 h1:gbLAJL7bF0+PCwjeFULpBnqbXAxYfs5wOIKKaKARC+s= -github.com/k8ssandra/cass-operator v1.20.0/go.mod h1:zXhK7q5+ymAYCuOvhwpLyNnjJAnQDGqwFc/j8nQQN6M= +github.com/k8ssandra/cass-operator v1.21.0 h1:ph9FlL8/j1ZejIeJBx6gkKqnza39EhRLhOIBOWSax74= +github.com/k8ssandra/cass-operator v1.21.0/go.mod h1:zXhK7q5+ymAYCuOvhwpLyNnjJAnQDGqwFc/j8nQQN6M= 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/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= diff --git a/pkg/test/testenv.go b/pkg/test/testenv.go index 7bfd59009..d211ecaca 100644 --- a/pkg/test/testenv.go +++ b/pkg/test/testenv.go @@ -46,7 +46,7 @@ import ( const ( clustersToCreate = 3 clusterProtoName = "cluster-%d-%s" - cassOperatorVersion = "v1.20.0" + cassOperatorVersion = "v1.21.0" prometheusOperatorVersion = "v0.9.0" )