Skip to content

Commit

Permalink
TMP: check SM regression fix
Browse files Browse the repository at this point in the history
This tmp commit job is to validate that the fix from
scylladb/scylla-manager#4000
indeed fixes the 3.3.1 SM regression reported in
scylladb/scylla-manager#3989.
  • Loading branch information
Michal-Leszczynski committed Sep 2, 2024
1 parent 80c490c commit 901a8fe
Show file tree
Hide file tree
Showing 11 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions deploy/manager-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ spec:
serviceAccountName: scylla-manager
containers:
- name: scylla-manager
image: docker.io/scylladb/scylla-manager:3.3.0@sha256:e8c5b62c9330f91dfca24f109b033df78113d3ffaac306edf6d3c4346e1fa0bf
image: docker.io/scylladb/scylla-manager:3.4.0-dev-0.20240902.c3ca05a61
imagePullPolicy: IfNotPresent
command:
- /usr/bin/scylla-manager
Expand Down Expand Up @@ -283,7 +283,7 @@ metadata:
namespace: scylla-manager
spec:
version: 6.1.0
agentVersion: 3.3.0
agentVersion: 3.4.0-dev-0.20240902.c3ca05a61
repository: docker.io/scylladb/scylla
agentRepository: docker.io/scylladb/scylla-manager-agent
developerMode: true
Expand Down
4 changes: 2 additions & 2 deletions deploy/manager-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ spec:
serviceAccountName: scylla-manager
containers:
- name: scylla-manager
image: docker.io/scylladb/scylla-manager:3.3.0@sha256:e8c5b62c9330f91dfca24f109b033df78113d3ffaac306edf6d3c4346e1fa0bf
image: docker.io/scylladb/scylla-manager:3.4.0-dev-0.20240902.c3ca05a61
imagePullPolicy: IfNotPresent
command:
- /usr/bin/scylla-manager
Expand Down Expand Up @@ -283,7 +283,7 @@ metadata:
namespace: scylla-manager
spec:
version: 6.1.0
agentVersion: 3.3.0
agentVersion: 3.4.0-dev-0.20240902.c3ca05a61
repository: docker.io/scylladb/scylla
agentRepository: docker.io/scylladb/scylla-manager-agent
developerMode: true
Expand Down
2 changes: 1 addition & 1 deletion deploy/manager/dev/50_manager_deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
serviceAccountName: scylla-manager
containers:
- name: scylla-manager
image: docker.io/scylladb/scylla-manager:3.3.0@sha256:e8c5b62c9330f91dfca24f109b033df78113d3ffaac306edf6d3c4346e1fa0bf
image: docker.io/scylladb/scylla-manager:3.4.0-dev-0.20240902.c3ca05a61
imagePullPolicy: IfNotPresent
command:
- /usr/bin/scylla-manager
Expand Down
2 changes: 1 addition & 1 deletion deploy/manager/dev/50_scyllacluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
namespace: scylla-manager
spec:
version: 6.1.0
agentVersion: 3.3.0
agentVersion: 3.4.0-dev-0.20240902.c3ca05a61
repository: docker.io/scylladb/scylla
agentRepository: docker.io/scylladb/scylla-manager-agent
developerMode: true
Expand Down
2 changes: 1 addition & 1 deletion deploy/manager/prod/50_manager_deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
serviceAccountName: scylla-manager
containers:
- name: scylla-manager
image: docker.io/scylladb/scylla-manager:3.3.0@sha256:e8c5b62c9330f91dfca24f109b033df78113d3ffaac306edf6d3c4346e1fa0bf
image: docker.io/scylladb/scylla-manager:3.4.0-dev-0.20240902.c3ca05a61
imagePullPolicy: IfNotPresent
command:
- /usr/bin/scylla-manager
Expand Down
2 changes: 1 addition & 1 deletion deploy/manager/prod/50_scyllacluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
namespace: scylla-manager
spec:
version: 6.1.0
agentVersion: 3.3.0
agentVersion: 3.4.0-dev-0.20240902.c3ca05a61
repository: docker.io/scylladb/scylla
agentRepository: docker.io/scylladb/scylla-manager-agent
developerMode: true
Expand Down
2 changes: 1 addition & 1 deletion helm/deploy/manager_prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ scylla:
repository: docker.io/scylladb/scylla
tag: 6.1.0
agentImage:
tag: 3.3.0
tag: 3.4.0-dev-0.20240902.c3ca05a61
repository: docker.io/scylladb/scylla-manager-agent
developerMode: true
cpuset: true
Expand Down
4 changes: 2 additions & 2 deletions helm/scylla-manager/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ fullnameOverride: ""
image:
repository: scylladb
pullPolicy: IfNotPresent
tag: 3.3.0@sha256:e8c5b62c9330f91dfca24f109b033df78113d3ffaac306edf6d3c4346e1fa0bf
tag: 3.4.0-dev-0.20240902.c3ca05a61

# Allows to customize Scylla Manager Controller image
controllerImage:
Expand Down Expand Up @@ -75,7 +75,7 @@ scylla:
scyllaImage:
tag: 6.1.0
agentImage:
tag: 3.3.0
tag: 3.4.0-dev-0.20240902.c3ca05a61
datacenter: manager-dc
racks:
- name: manager-rack
Expand Down
2 changes: 1 addition & 1 deletion helm/scylla/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ scyllaImage:
agentImage:
repository: scylladb/scylla-manager-agent
# Overrides the image tag whose default is the chart appVersion.
tag: 3.3.0
tag: 3.4.0-dev-0.20240902.c3ca05a61

serviceAccount:
# Specifies whether a service account should be created
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/fixture/scylla/scyllacluster.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
annotations:
bar: foo
spec:
agentVersion: 3.3.0
agentVersion: 3.4.0-dev-0.20240902.c3ca05a61
version: 6.1.0
developerMode: true
exposeOptions:
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/fixture/scylla/zonal.scyllacluster.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
annotations:
bar: foo
spec:
agentVersion: 3.3.0
agentVersion: 3.4.0-dev-0.20240902.c3ca05a61
version: 6.1.0
developerMode: true
exposeOptions:
Expand Down

0 comments on commit 901a8fe

Please sign in to comment.