diff --git a/CHANGELOG/CHANGELOG-1.16.md b/CHANGELOG/CHANGELOG-1.16.md index 60c24e203..b925ea155 100644 --- a/CHANGELOG/CHANGELOG-1.16.md +++ b/CHANGELOG/CHANGELOG-1.16.md @@ -16,5 +16,6 @@ When cutting a new release, update the `unreleased` heading to the tag being gen ## unreleased * [CHANGE] Update cassandra-medusa to 0.21.0 +* [CHANGE] []() Update cass-operator to v1.20.0 * [BUGFIX] [#1272](https://github.com/k8ssandra/k8ssandra-operator/issues/1272) Prevent cass-operator from creating users when an external DC is referenced to allow migration through expansion -* [ENHANCEMENT] [#1066](https://github.com/k8ssandra/k8ssandra-operator/issues/1066) Remove the medusa standalone pod as it is not needed anymore \ No newline at end of file +* [ENHANCEMENT] [#1066](https://github.com/k8ssandra/k8ssandra-operator/issues/1066) Remove the medusa standalone pod as it is not needed anymore diff --git a/charts/k8ssandra-operator/Chart.yaml b/charts/k8ssandra-operator/Chart.yaml index a6b5fa719..4e8446ee5 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.47.2 + version: 0.51.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 b80f83aa7..086cda435 100644 --- a/config/cass-operator/cluster-scoped/kustomization.yaml +++ b/config/cass-operator/cluster-scoped/kustomization.yaml @@ -2,10 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- github.com/k8ssandra/cass-operator/config/deployments/cluster?ref=v1.19.1 - -components: - - ../../components/cass-operator-image-config -images: -- name: k8ssandra/cass-operator - newTag: v1.19.1 +- github.com/k8ssandra/cass-operator/config/deployments/cluster?ref=v1.20.0 diff --git a/config/cass-operator/ns-scoped/kustomization.yaml b/config/cass-operator/ns-scoped/kustomization.yaml index 620ab4ec8..1a8b64439 100644 --- a/config/cass-operator/ns-scoped/kustomization.yaml +++ b/config/cass-operator/ns-scoped/kustomization.yaml @@ -2,11 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- github.com/k8ssandra/cass-operator/config/deployments/default?ref=v1.19.1 - -components: - - ../../components/cass-operator-image-config - -images: -- name: k8ssandra/cass-operator - newTag: v1.19.1 +- github.com/k8ssandra/cass-operator/config/deployments/default?ref=v1.20.0 diff --git a/config/components/cass-operator-image-config/image_config.yaml b/config/components/cass-operator-image-config/image_config.yaml index 2a820aeb9..c1526f8cb 100644 --- a/config/components/cass-operator-image-config/image_config.yaml +++ b/config/components/cass-operator-image-config/image_config.yaml @@ -3,7 +3,7 @@ kind: ImageConfig metadata: name: image-config images: - system-logger: "k8ssandra/system-logger:v1.19.1" + 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: diff --git a/docs/content/en/contribute/_index.md b/docs/content/en/contribute/_index.md index 9ffdebbbb..2671876ae 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.12.0" + cassOperatorVersion = "v1.20.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.12.0 + - github.com/k8ssandra/cass-operator/config/deployments/default?ref=v1.20.0 images: - name: k8ssandra/cass-operator - newTag: v1.12.0 + newTag: v1.20.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/pkg/test/testenv.go b/pkg/test/testenv.go index 7936c5ffb..a38491842 100644 --- a/pkg/test/testenv.go +++ b/pkg/test/testenv.go @@ -45,7 +45,7 @@ import ( const ( clustersToCreate = 3 clusterProtoName = "cluster-%d-%s" - cassOperatorVersion = "v1.19.1" + cassOperatorVersion = "v1.20.0" prometheusOperatorVersion = "v0.9.0" ) diff --git a/test/kuttl/test-servicemonitors/03-assert.yaml b/test/kuttl/test-servicemonitors/03-assert.yaml index e30bed93c..e05cfd537 100644 --- a/test/kuttl/test-servicemonitors/03-assert.yaml +++ b/test/kuttl/test-servicemonitors/03-assert.yaml @@ -1,42 +1,3 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: test-dc1-default-sts - namespace: k8ssandra-operator -spec: - template: - spec: - containers: - - env: - - name: LOCAL_JMX - value: "no" - - name: MGMT_API_DISABLE_MCAC - value: "true" - - name: POD_NAME - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.name - - name: NODE_NAME - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: spec.nodeName - - name: DS_LICENSE - value: accept - - name: DSE_AUTO_CONF_OFF - value: all - - name: USE_MGMT_API - value: "true" - - name: MGMT_API_EXPLICIT_START - value: "true" - - name: DSE_MGMT_EXPLICIT_START - value: "true" - name: cassandra - - image: k8ssandra/system-logger:v1.19.1 - name: server-system-logger -status: - readyReplicas: 1 --- apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor