Skip to content

Commit

Permalink
Upgrade deployment to cass-operator v1.20.0 (#1307)
Browse files Browse the repository at this point in the history
  • Loading branch information
burmanm authored May 6, 2024
1 parent bd6f311 commit 7486e18
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 61 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG/CHANGELOG-1.16.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
* [ENHANCEMENT] [#1066](https://github.com/k8ssandra/k8ssandra-operator/issues/1066) Remove the medusa standalone pod as it is not needed anymore
2 changes: 1 addition & 1 deletion charts/k8ssandra-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 1 addition & 7 deletions config/cass-operator/cluster-scoped/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 1 addition & 8 deletions config/cass-operator/ns-scoped/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions docs/content/en/contribute/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
```
Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/test/testenv.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ import (
const (
clustersToCreate = 3
clusterProtoName = "cluster-%d-%s"
cassOperatorVersion = "v1.19.1"
cassOperatorVersion = "v1.20.0"
prometheusOperatorVersion = "v0.9.0"
)

Expand Down
39 changes: 0 additions & 39 deletions test/kuttl/test-servicemonitors/03-assert.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 7486e18

Please sign in to comment.