From 944f006ad41657c796c57dfab79a8c9ae7e6b17b Mon Sep 17 00:00:00 2001 From: Alexander Dejanovski Date: Thu, 19 Sep 2024 13:27:47 +0200 Subject: [PATCH 1/4] Upgrade cass-operator to v1.22.4 (#1414) --- CHANGELOG/CHANGELOG-1.20.md | 4 ++++ charts/k8ssandra-operator/Chart.yaml | 2 +- config/cass-operator/cluster-scoped/kustomization.yaml | 2 +- config/cass-operator/ns-scoped/kustomization.yaml | 2 +- go.mod | 2 +- go.sum | 4 ++-- pkg/test/testenv.go | 2 +- 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/CHANGELOG/CHANGELOG-1.20.md b/CHANGELOG/CHANGELOG-1.20.md index 1e1936165..f69d8a260 100644 --- a/CHANGELOG/CHANGELOG-1.20.md +++ b/CHANGELOG/CHANGELOG-1.20.md @@ -13,6 +13,10 @@ Changelog for the K8ssandra Operator, new PRs should update the `unreleased` sec When cutting a new release, update the `unreleased` heading to the tag being generated and date, like `## vX.Y.Z - YYYY-MM-DD` and create a new placeholder section for `unreleased` entries. +## Unreleased + +* [BUGFIX] Upgrade cass-operator to v1.22.4 to fix security context overwrites + ## v1.20.0 - 2024-09-18 * [BUGFIX] [#1399](https://github.com/k8ssandra/k8ssandra-operator/issues/1399) Fixed SecretSyncController to handle multiple namespaces diff --git a/charts/k8ssandra-operator/Chart.yaml b/charts/k8ssandra-operator/Chart.yaml index a6c625396..ef81b00f2 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.53.5 + version: 0.53.6 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 6d8438f63..aacf08d4c 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.22.1 +- github.com/k8ssandra/cass-operator/config/deployments/cluster?ref=v1.22.4 diff --git a/config/cass-operator/ns-scoped/kustomization.yaml b/config/cass-operator/ns-scoped/kustomization.yaml index 604648570..18fbf88f1 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.22.1 +- github.com/k8ssandra/cass-operator/config/deployments/default?ref=v1.22.4 diff --git a/go.mod b/go.mod index 824bb968b..f021b21d4 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.22.3 + github.com/k8ssandra/cass-operator v1.22.4 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 74e506474..89b8485c9 100644 --- a/go.sum +++ b/go.sum @@ -1438,8 +1438,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.22.3 h1:ikzoJvyr2ZV2aGvUD0eByNwHvg24vJw8jm0ThSRSL/Q= -github.com/k8ssandra/cass-operator v1.22.3/go.mod h1:KtROSvoTwB6eFzcRjOmTUAGkbDHnNtK4ayk4KDllHy4= +github.com/k8ssandra/cass-operator v1.22.4 h1:kcVVSvm6H50j+ZyOCBlYEfwaoxd755NjSQSBt3SfIpg= +github.com/k8ssandra/cass-operator v1.22.4/go.mod h1:KtROSvoTwB6eFzcRjOmTUAGkbDHnNtK4ayk4KDllHy4= 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 49ff86006..9c0e8adb2 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.22.1" + cassOperatorVersion = "v1.22.4" prometheusOperatorVersion = "v0.9.0" ) From c491ddc45d25cea7e5380016480a0576681b6fbd Mon Sep 17 00:00:00 2001 From: Alexander Dejanovski Date: Thu, 19 Sep 2024 14:02:23 +0200 Subject: [PATCH 2/4] Update changelog for v1.20.1 --- CHANGELOG/CHANGELOG-1.20.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG/CHANGELOG-1.20.md b/CHANGELOG/CHANGELOG-1.20.md index f69d8a260..2c494452b 100644 --- a/CHANGELOG/CHANGELOG-1.20.md +++ b/CHANGELOG/CHANGELOG-1.20.md @@ -13,7 +13,7 @@ Changelog for the K8ssandra Operator, new PRs should update the `unreleased` sec When cutting a new release, update the `unreleased` heading to the tag being generated and date, like `## vX.Y.Z - YYYY-MM-DD` and create a new placeholder section for `unreleased` entries. -## Unreleased +## v1.20.1 - 2024-09-19 * [BUGFIX] Upgrade cass-operator to v1.22.4 to fix security context overwrites From c09d0ba519a09cbea8ec2b5232d9809dd0fc49f7 Mon Sep 17 00:00:00 2001 From: Alexander Dejanovski Date: Thu, 19 Sep 2024 14:02:43 +0200 Subject: [PATCH 3/4] Release v1.20.1 --- charts/k8ssandra-operator/Chart.yaml | 2 +- config/deployments/default/kustomization.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/k8ssandra-operator/Chart.yaml b/charts/k8ssandra-operator/Chart.yaml index ef81b00f2..5011c727f 100644 --- a/charts/k8ssandra-operator/Chart.yaml +++ b/charts/k8ssandra-operator/Chart.yaml @@ -3,7 +3,7 @@ name: k8ssandra-operator description: | Kubernetes operator which handles the provisioning and management of K8ssandra clusters. type: application -version: 1.20.1-SNAPSHOT +version: 1.20.1 dependencies: - name: k8ssandra-common version: 0.29.0 diff --git a/config/deployments/default/kustomization.yaml b/config/deployments/default/kustomization.yaml index bec55fd12..d0df079bb 100644 --- a/config/deployments/default/kustomization.yaml +++ b/config/deployments/default/kustomization.yaml @@ -5,4 +5,4 @@ resources: - ../../default images: - name: cr.k8ssandra.io/k8ssandra/k8ssandra-operator - newTag: 1.20-latest + newTag: v1.20.1 From b07d73d6b81f128478d3dbfb14df7722e0e0a756 Mon Sep 17 00:00:00 2001 From: Alexander Dejanovski Date: Thu, 19 Sep 2024 18:06:30 +0200 Subject: [PATCH 4/4] Prepare next patch release --- charts/k8ssandra-operator/Chart.yaml | 2 +- config/deployments/default/kustomization.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/k8ssandra-operator/Chart.yaml b/charts/k8ssandra-operator/Chart.yaml index 5011c727f..c09d7e485 100644 --- a/charts/k8ssandra-operator/Chart.yaml +++ b/charts/k8ssandra-operator/Chart.yaml @@ -3,7 +3,7 @@ name: k8ssandra-operator description: | Kubernetes operator which handles the provisioning and management of K8ssandra clusters. type: application -version: 1.20.1 +version: 1.20.2-SNAPSHOT dependencies: - name: k8ssandra-common version: 0.29.0 diff --git a/config/deployments/default/kustomization.yaml b/config/deployments/default/kustomization.yaml index d0df079bb..bec55fd12 100644 --- a/config/deployments/default/kustomization.yaml +++ b/config/deployments/default/kustomization.yaml @@ -5,4 +5,4 @@ resources: - ../../default images: - name: cr.k8ssandra.io/k8ssandra/k8ssandra-operator - newTag: v1.20.1 + newTag: 1.20-latest