From 15b0ad97bcecb55b019a5b17a0f6ffc93639b332 Mon Sep 17 00:00:00 2001 From: Alexander Dejanovski Date: Fri, 6 Oct 2023 16:25:40 +0200 Subject: [PATCH] Upgrade to Reaper 3.3.4 and Medusa 0.16.2 (#1083) --- CHANGELOG/CHANGELOG-1.9.md | 2 ++ apis/reaper/v1alpha1/reaper_types.go | 8 ++++---- config/crd/bases/k8ssandra.io_k8ssandraclusters.yaml | 8 ++++---- config/crd/bases/reaper.k8ssandra.io_reapers.yaml | 8 ++++---- pkg/medusa/reconcile.go | 2 +- pkg/reaper/deployment.go | 2 +- pkg/reaper/deployment_test.go | 8 ++++---- 7 files changed, 20 insertions(+), 18 deletions(-) diff --git a/CHANGELOG/CHANGELOG-1.9.md b/CHANGELOG/CHANGELOG-1.9.md index a649b213b..77268c164 100644 --- a/CHANGELOG/CHANGELOG-1.9.md +++ b/CHANGELOG/CHANGELOG-1.9.md @@ -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 diff --git a/apis/reaper/v1alpha1/reaper_types.go b/apis/reaper/v1alpha1/reaper_types.go index 12276cad4..fe6973dad 100644 --- a/apis/reaper/v1alpha1/reaper_types.go +++ b/apis/reaper/v1alpha1/reaper_types.go @@ -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" diff --git a/config/crd/bases/k8ssandra.io_k8ssandraclusters.yaml b/config/crd/bases/k8ssandra.io_k8ssandraclusters.yaml index a75d4bcbe..e73575ad6 100644 --- a/config/crd/bases/k8ssandra.io_k8ssandraclusters.yaml +++ b/config/crd/bases/k8ssandra.io_k8ssandraclusters.yaml @@ -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. @@ -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. diff --git a/config/crd/bases/reaper.k8ssandra.io_reapers.yaml b/config/crd/bases/reaper.k8ssandra.io_reapers.yaml index 9602344bd..03461285d 100644 --- a/config/crd/bases/reaper.k8ssandra.io_reapers.yaml +++ b/config/crd/bases/reaper.k8ssandra.io_reapers.yaml @@ -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. @@ -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. diff --git a/pkg/medusa/reconcile.go b/pkg/medusa/reconcile.go index 65ff37920..d3e19842d 100644 --- a/pkg/medusa/reconcile.go +++ b/pkg/medusa/reconcile.go @@ -24,7 +24,7 @@ import ( const ( DefaultMedusaImageRepository = "k8ssandra" DefaultMedusaImageName = "medusa" - DefaultMedusaVersion = "0.16.1" + DefaultMedusaVersion = "0.16.2" DefaultMedusaPort = 50051 DefaultProbeInitialDelay = 10 DefaultProbeTimeout = 1 diff --git a/pkg/reaper/deployment.go b/pkg/reaper/deployment.go index 527167d1b..d4148cde0 100644 --- a/pkg/reaper/deployment.go +++ b/pkg/reaper/deployment.go @@ -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. diff --git a/pkg/reaper/deployment_test.go b/pkg/reaper/deployment_test.go index 066e45899..4150875ae 100644 --- a/pkg/reaper/deployment_test.go +++ b/pkg/reaper/deployment_test.go @@ -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) @@ -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)