Skip to content

Commit

Permalink
Upgrade Reaper
Browse files Browse the repository at this point in the history
  • Loading branch information
@adejanovski
adejanovski committed Oct 24, 2023
1 parent 815e2a7 commit 31f7313
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
8 changes: 4 additions & 4 deletions apis/reaper/v1alpha1/reaper_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,17 +67,17 @@ type ReaperTemplate struct {
SecretsProvider string `json:"secretsProvider,omitempty"`

// The image to use for the Reaper pod main container.
// The default is "thelastpickle/cassandra-reaper:7162ea3".
// The default is "thelastpickle/cassandra-reaper:0c1c835".
// +optional
// TODO: update with real release version.
// +kubebuilder:default={repository:"thelastpickle",name:"cassandra-reaper",tag:"7162ea3"}
// +kubebuilder:default={repository:"thelastpickle",name:"cassandra-reaper",tag:"0c1c835"}
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:7162ea3".
// The default is "thelastpickle/cassandra-reaper:0c1c835".
// +optional
// TODO: update with real release version.
// +kubebuilder:default={repository:"thelastpickle",name:"cassandra-reaper",tag:"7162ea3"}
// +kubebuilder:default={repository:"thelastpickle",name:"cassandra-reaper",tag:"0c1c835"}
InitContainerImage *images.Image `json:"initContainerImage,omitempty"`

// +kubebuilder:default="default"
Expand Down
8 changes: 4 additions & 4 deletions config/crd/bases/k8ssandra.io_k8ssandraclusters.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28402,9 +28402,9 @@ spec:
default:
name: cassandra-reaper
repository: thelastpickle
tag: 7162ea3
tag: 0c1c835
description: 'The image to use for the Reaper pod main container.
The default is "thelastpickle/cassandra-reaper:7162ea3". TODO:
The default is "thelastpickle/cassandra-reaper:0c1c835". TODO:
update with real release version.'
properties:
name:
Expand Down Expand Up @@ -28476,9 +28476,9 @@ spec:
default:
name: cassandra-reaper
repository: thelastpickle
tag: 7162ea3
tag: 0c1c835
description: 'The image to use for the Reaper pod init container
(that performs schema migrations). The default is "thelastpickle/cassandra-reaper:7162ea3".
(that performs schema migrations). The default is "thelastpickle/cassandra-reaper:0c1c835".
TODO: update with real release version.'
properties:
name:
Expand Down
8 changes: 4 additions & 4 deletions config/crd/bases/reaper.k8ssandra.io_reapers.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1046,9 +1046,9 @@ spec:
default:
name: cassandra-reaper
repository: thelastpickle
tag: 7162ea3
tag: 0c1c835
description: 'The image to use for the Reaper pod main container.
The default is "thelastpickle/cassandra-reaper:7162ea3". TODO: update
The default is "thelastpickle/cassandra-reaper:0c1c835". TODO: update
with real release version.'
properties:
name:
Expand Down Expand Up @@ -1146,9 +1146,9 @@ spec:
default:
name: cassandra-reaper
repository: thelastpickle
tag: 7162ea3
tag: 0c1c835
description: 'The image to use for the Reaper pod init container (that
performs schema migrations). The default is "thelastpickle/cassandra-reaper:7162ea3".
performs schema migrations). The default is "thelastpickle/cassandra-reaper:0c1c835".
TODO: update with real release version.'
properties:
name:
Expand Down
2 changes: 1 addition & 1 deletion pkg/reaper/deployment.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
const (
DefaultImageRepository = "thelastpickle"
DefaultImageName = "cassandra-reaper"
DefaultVersion = "7162ea3"
DefaultVersion = "0c1c835"
// 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
Original file line number Diff line number Diff line change
Expand Up @@ -311,8 +311,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:7162ea3", deployment.Spec.Template.Spec.InitContainers[0].Image)
assert.Equal(t, "docker.io/thelastpickle/cassandra-reaper:7162ea3", deployment.Spec.Template.Spec.Containers[0].Image)
assert.Equal(t, "docker.io/thelastpickle/cassandra-reaper:0c1c835", deployment.Spec.Template.Spec.InitContainers[0].Image)
assert.Equal(t, "docker.io/thelastpickle/cassandra-reaper:0c1c835", 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 @@ -327,8 +327,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:7162ea3", deployment.Spec.Template.Spec.InitContainers[0].Image)
assert.Equal(t, "docker.io/thelastpickle/cassandra-reaper:7162ea3", deployment.Spec.Template.Spec.Containers[0].Image)
assert.Equal(t, "docker.io/thelastpickle/cassandra-reaper:0c1c835", deployment.Spec.Template.Spec.InitContainers[0].Image)
assert.Equal(t, "docker.io/thelastpickle/cassandra-reaper:0c1c835", 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

0 comments on commit 31f7313

Please sign in to comment.