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.

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 to Reaper 3.3.4 and Medusa 0.16.2 #1083

Merged
merged 1 commit into from
Oct 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions CHANGELOG/CHANGELOG-1.9.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ When cutting a new release, update the `unreleased` heading to the tag being gen

## unreleased

* [CHANGE] Upgrade to Reaper v3.3.4 for arm64 support
* [CHANGE] Upgrade to cass-operator v1.17.2 to fix issues with Medusa modifying initContainers when used with Cassandra 4.1
* [BUGFIX] Upgrade to Medusa v0.16.2 to fix issues with listing backups

## v1.9.0 - 2023-09-20

Expand Down
8 changes: 4 additions & 4 deletions apis/reaper/v1alpha1/reaper_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,15 @@ 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.2.1".
// The default is "thelastpickle/cassandra-reaper:3.3.4".
// +optional
// +kubebuilder:default={repository:"thelastpickle",name:"cassandra-reaper",tag:"3.2.1"}
// +kubebuilder:default={repository:"thelastpickle",name:"cassandra-reaper",tag:"3.3.4"}
ContainerImage *images.Image `json:"containerImage,omitempty"`

// The image to use for the Reaper pod init container (that performs schema migrations).
// The default is "thelastpickle/cassandra-reaper:3.2.1".
// The default is "thelastpickle/cassandra-reaper:3.3.4".
// +optional
// +kubebuilder:default={repository:"thelastpickle",name:"cassandra-reaper",tag:"3.2.1"}
// +kubebuilder:default={repository:"thelastpickle",name:"cassandra-reaper",tag:"3.3.4"}
InitContainerImage *images.Image `json:"initContainerImage,omitempty"`

// +kubebuilder:default="default"
Expand Down
8 changes: 4 additions & 4 deletions config/crd/bases/k8ssandra.io_k8ssandraclusters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28402,9 +28402,9 @@ spec:
default:
name: cassandra-reaper
repository: thelastpickle
tag: 3.2.1
tag: 3.3.4
description: The image to use for the Reaper pod main container.
The default is "thelastpickle/cassandra-reaper:3.2.1".
The default is "thelastpickle/cassandra-reaper:3.3.4".
properties:
name:
description: The image name to use.
Expand Down Expand Up @@ -28461,9 +28461,9 @@ spec:
default:
name: cassandra-reaper
repository: thelastpickle
tag: 3.2.1
tag: 3.3.4
description: The image to use for the Reaper pod init container
(that performs schema migrations). The default is "thelastpickle/cassandra-reaper:3.2.1".
(that performs schema migrations). The default is "thelastpickle/cassandra-reaper:3.3.4".
properties:
name:
description: The image name to use.
Expand Down
8 changes: 4 additions & 4 deletions config/crd/bases/reaper.k8ssandra.io_reapers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1046,9 +1046,9 @@ spec:
default:
name: cassandra-reaper
repository: thelastpickle
tag: 3.2.1
tag: 3.3.4
description: The image to use for the Reaper pod main container. The
default is "thelastpickle/cassandra-reaper:3.2.1".
default is "thelastpickle/cassandra-reaper:3.3.4".
properties:
name:
description: The image name to use.
Expand Down Expand Up @@ -1131,9 +1131,9 @@ spec:
default:
name: cassandra-reaper
repository: thelastpickle
tag: 3.2.1
tag: 3.3.4
description: The image to use for the Reaper pod init container (that
performs schema migrations). The default is "thelastpickle/cassandra-reaper:3.2.1".
performs schema migrations). The default is "thelastpickle/cassandra-reaper:3.3.4".
properties:
name:
description: The image name to use.
Expand Down
2 changes: 1 addition & 1 deletion pkg/medusa/reconcile.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
const (
DefaultMedusaImageRepository = "k8ssandra"
DefaultMedusaImageName = "medusa"
DefaultMedusaVersion = "0.16.1"
DefaultMedusaVersion = "0.16.2"
DefaultMedusaPort = 50051
DefaultProbeInitialDelay = 10
DefaultProbeTimeout = 1
Expand Down
2 changes: 1 addition & 1 deletion pkg/reaper/deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
const (
DefaultImageRepository = "thelastpickle"
DefaultImageName = "cassandra-reaper"
DefaultVersion = "3.2.1"
DefaultVersion = "3.3.4"
// 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
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,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.2.1", deployment.Spec.Template.Spec.InitContainers[0].Image)
assert.Equal(t, "docker.io/thelastpickle/cassandra-reaper:3.2.1", deployment.Spec.Template.Spec.Containers[0].Image)
assert.Equal(t, "docker.io/thelastpickle/cassandra-reaper:3.3.4", deployment.Spec.Template.Spec.InitContainers[0].Image)
assert.Equal(t, "docker.io/thelastpickle/cassandra-reaper:3.3.4", 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 @@ -318,8 +318,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.2.1", deployment.Spec.Template.Spec.InitContainers[0].Image)
assert.Equal(t, "docker.io/thelastpickle/cassandra-reaper:3.2.1", deployment.Spec.Template.Spec.Containers[0].Image)
assert.Equal(t, "docker.io/thelastpickle/cassandra-reaper:3.3.4", deployment.Spec.Template.Spec.InitContainers[0].Image)
assert.Equal(t, "docker.io/thelastpickle/cassandra-reaper:3.3.4", 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