diff --git a/CHANGELOG/CHANGELOG-1.21.md b/CHANGELOG/CHANGELOG-1.21.md index 6d4d84c69..dcd092818 100644 --- a/CHANGELOG/CHANGELOG-1.21.md +++ b/CHANGELOG/CHANGELOG-1.21.md @@ -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` diff --git a/apis/reaper/v1alpha1/reaper_types.go b/apis/reaper/v1alpha1/reaper_types.go index fda1feef5..ca7e8e245 100644 --- a/apis/reaper/v1alpha1/reaper_types.go +++ b/apis/reaper/v1alpha1/reaper_types.go @@ -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. diff --git a/charts/k8ssandra-operator/crds/k8ssandra-operator-crds.yaml b/charts/k8ssandra-operator/crds/k8ssandra-operator-crds.yaml index db9f5e04b..e95dada78 100644 --- a/charts/k8ssandra-operator/crds/k8ssandra-operator-crds.yaml +++ b/charts/k8ssandra-operator/crds/k8ssandra-operator-crds.yaml @@ -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: @@ -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: diff --git a/config/crd/bases/k8ssandra.io_k8ssandraclusters.yaml b/config/crd/bases/k8ssandra.io_k8ssandraclusters.yaml index 4bccdf4bd..3cb1f2a13 100644 --- a/config/crd/bases/k8ssandra.io_k8ssandraclusters.yaml +++ b/config/crd/bases/k8ssandra.io_k8ssandraclusters.yaml @@ -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: diff --git a/config/crd/bases/reaper.k8ssandra.io_reapers.yaml b/config/crd/bases/reaper.k8ssandra.io_reapers.yaml index f32c358ae..19f01584e 100644 --- a/config/crd/bases/reaper.k8ssandra.io_reapers.yaml +++ b/config/crd/bases/reaper.k8ssandra.io_reapers.yaml @@ -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: diff --git a/pkg/reaper/deployment.go b/pkg/reaper/deployment.go index cff7af0b4..1fec39b04 100644 --- a/pkg/reaper/deployment.go +++ b/pkg/reaper/deployment.go @@ -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. diff --git a/pkg/reaper/deployment_test.go b/pkg/reaper/deployment_test.go index 9dc08f590..7ffabc863 100644 --- a/pkg/reaper/deployment_test.go +++ b/pkg/reaper/deployment_test.go @@ -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) @@ -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)