Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Reaper to 3.7.0 - K8OP-296 #1459

Merged
merged 1 commit into from
Nov 27, 2024
Merged

Upgrade Reaper to 3.7.0 - K8OP-296 #1459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG/CHANGELOG-1.21.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ When cutting a new release, update the `unreleased` heading to the tag being gen
## unreleased

* [CHANGE] [#1441](https://github.com/k8ssandra/k8ssandra-operator/issues/1441) Use k8ssandra-client instead of k8ssandra-tools for CRD upgrades
* [BUGFIX] [#1383](https://github.com/k8ssandra/k8ssandra-operator/issues/1383) Do not create MedusaBackup if MadusaBakupJob did not fully succeed
* [BUGFIX] [#1383](https://github.com/k8ssandra/k8ssandra-operator/issues/1383) Do not create MedusaBackup if MedusaBakupJob did not fully succeed
* [ENHANCEMENT] [#1667](https://github.com/k8ssahttps://github.com/k8ssandra/k8ssandra/issues/1667) Add `skipSchemaMigration` option to `K8ssandraCluster.spec.reaper`
4 changes: 2 additions & 2 deletions apis/reaper/v1alpha1/reaper_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@ type ReaperTemplate struct {
SecretsProvider string `json:"secretsProvider,omitempty"`

// The image to use for the Reaper pod main container.
// The default is "thelastpickle/cassandra-reaper:3.6.1".
// The default is "thelastpickle/cassandra-reaper:3.7.0".
// +optional
// TODO: update with real release version.
// +kubebuilder:default={repository:"thelastpickle",name:"cassandra-reaper",tag:"3.6.1"}
// +kubebuilder:default={repository:"thelastpickle",name:"cassandra-reaper",tag:"3.7.0"}
ContainerImage *images.Image `json:"containerImage,omitempty"`

// Deprecated: The main container image will be used for the init container as well.
Expand Down
8 changes: 4 additions & 4 deletions charts/k8ssandra-operator/crds/k8ssandra-operator-crds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27562,10 +27562,10 @@ spec:
default:
name: cassandra-reaper
repository: thelastpickle
tag: 3.6.1
tag: 3.7.0
description: |-
The image to use for the Reaper pod main container.
The default is "thelastpickle/cassandra-reaper:3.6.1".
The default is "thelastpickle/cassandra-reaper:3.7.0".
TODO: update with real release version.
properties:
name:
Expand Down Expand Up @@ -33690,10 +33690,10 @@ spec:
default:
name: cassandra-reaper
repository: thelastpickle
tag: 3.6.1
tag: 3.7.0
description: |-
The image to use for the Reaper pod main container.
The default is "thelastpickle/cassandra-reaper:3.6.1".
The default is "thelastpickle/cassandra-reaper:3.7.0".
TODO: update with real release version.
properties:
name:
Expand Down
4 changes: 2 additions & 2 deletions config/crd/bases/k8ssandra.io_k8ssandraclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27500,10 +27500,10 @@ spec:
default:
name: cassandra-reaper
repository: thelastpickle
tag: 3.6.1
tag: 3.7.0
description: |-
The image to use for the Reaper pod main container.
The default is "thelastpickle/cassandra-reaper:3.6.1".
The default is "thelastpickle/cassandra-reaper:3.7.0".
TODO: update with real release version.
properties:
name:
Expand Down
4 changes: 2 additions & 2 deletions config/crd/bases/reaper.k8ssandra.io_reapers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1110,10 +1110,10 @@ spec:
default:
name: cassandra-reaper
repository: thelastpickle
tag: 3.6.1
tag: 3.7.0
description: |-
The image to use for the Reaper pod main container.
The default is "thelastpickle/cassandra-reaper:3.6.1".
The default is "thelastpickle/cassandra-reaper:3.7.0".
TODO: update with real release version.
properties:
name:
Expand Down
2 changes: 1 addition & 1 deletion pkg/reaper/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
const (
DefaultImageRepository = "thelastpickle"
DefaultImageName = "cassandra-reaper"
DefaultVersion = "3.6.1"
DefaultVersion = "3.7.0"
// When changing the default version above, please also change the kubebuilder markers in
// apis/reaper/v1alpha1/reaper_types.go accordingly.

Expand Down
8 changes: 4 additions & 4 deletions pkg/reaper/deployment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,8 +410,8 @@ func TestImages(t *testing.T) {
reaper.Spec.ContainerImage = nil
logger := testlogr.NewTestLogger(t)
deployment := NewDeployment(reaper, newTestDatacenter(), nil, nil, logger)
assert.Equal(t, "docker.io/thelastpickle/cassandra-reaper:3.6.1", deployment.Spec.Template.Spec.InitContainers[0].Image)
assert.Equal(t, "docker.io/thelastpickle/cassandra-reaper:3.6.1", deployment.Spec.Template.Spec.Containers[0].Image)
assert.Equal(t, "docker.io/thelastpickle/cassandra-reaper:3.7.0", deployment.Spec.Template.Spec.InitContainers[0].Image)
assert.Equal(t, "docker.io/thelastpickle/cassandra-reaper:3.7.0", deployment.Spec.Template.Spec.Containers[0].Image)
assert.Equal(t, corev1.PullIfNotPresent, deployment.Spec.Template.Spec.InitContainers[0].ImagePullPolicy)
assert.Equal(t, corev1.PullIfNotPresent, deployment.Spec.Template.Spec.Containers[0].ImagePullPolicy)
assert.Empty(t, deployment.Spec.Template.Spec.ImagePullSecrets)
Expand All @@ -421,8 +421,8 @@ func TestImages(t *testing.T) {
reaper.Spec.ContainerImage = nil
logger := testlogr.NewTestLogger(t)
deployment := NewDeployment(reaper, newTestDatacenter(), nil, nil, logger)
assert.Equal(t, "docker.io/thelastpickle/cassandra-reaper:3.6.1", deployment.Spec.Template.Spec.InitContainers[0].Image)
assert.Equal(t, "docker.io/thelastpickle/cassandra-reaper:3.6.1", deployment.Spec.Template.Spec.Containers[0].Image)
assert.Equal(t, "docker.io/thelastpickle/cassandra-reaper:3.7.0", deployment.Spec.Template.Spec.InitContainers[0].Image)
assert.Equal(t, "docker.io/thelastpickle/cassandra-reaper:3.7.0", deployment.Spec.Template.Spec.Containers[0].Image)
assert.Equal(t, corev1.PullIfNotPresent, deployment.Spec.Template.Spec.InitContainers[0].ImagePullPolicy)
assert.Equal(t, corev1.PullIfNotPresent, deployment.Spec.Template.Spec.Containers[0].ImagePullPolicy)
assert.Empty(t, deployment.Spec.Template.Spec.ImagePullSecrets)
Expand Down
Loading