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

Test sm 3.4.1 #2286

Closed
Closed
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
4 changes: 2 additions & 2 deletions assets/config/config.yaml
Original file line number Diff line number Diff line change
@@ -5,8 +5,8 @@ operator:
# In the future, enterprise versions should be run as a different config instance in its own run.
scyllaDBEnterpriseVersionNeedingConsistentClusterManagementOverride: "2024.1.11"
scyllaDBUtilsImage: "docker.io/scylladb/scylla:6.2.0@sha256:5b53a7c60d9f9555bb87791ff29b2e633c6f472aec00de7afaf4db1addc6d594"
scyllaDBManagerVersion: "3.4.0@sha256:6424c36929b39ef4e679ee7d61578b1070e28c186b23b278147fde8e391d9db1"
scyllaDBManagerAgentVersion: "3.4.0@sha256:441403aed8880cad1feef68aa7a8ee9ffd99a458dc1dcff3dc54ce5bf3cb07b7"
scyllaDBManagerVersion: "3.4.0-0.20241218.faf39b6f2"
scyllaDBManagerAgentVersion: "3.4.0-0.20241218.faf39b6f2"
bashToolsImage: "registry.access.redhat.com/ubi9/ubi:9.5-1731517889@sha256:2bae9062eddbbc18e76555972e7026ffe02cef560a0076e6d7f72bed2c05723f"
grafanaImage: "docker.io/grafana/grafana:11.3.0@sha256:a0f881232a6fb71a0554a47d0fe2203b6888fe77f4cefb7ea62bed7eb54e13c3"
grafanaDefaultPlatformDashboard: "scylladb-6.2/scylla-overview.6.2.json"
4 changes: 2 additions & 2 deletions deploy/manager-dev.yaml
Original file line number Diff line number Diff line change
@@ -251,7 +251,7 @@ spec:
serviceAccountName: scylla-manager
containers:
- name: scylla-manager
image: docker.io/scylladb/scylla-manager:3.4.0@sha256:6424c36929b39ef4e679ee7d61578b1070e28c186b23b278147fde8e391d9db1
image: docker.io/scylladb/scylla-manager:3.4.0-0.20241218.faf39b6f2
imagePullPolicy: IfNotPresent
command:
- /usr/bin/scylla-manager
@@ -283,7 +283,7 @@ metadata:
namespace: scylla-manager
spec:
version: 6.2.0
agentVersion: 3.4.0@sha256:441403aed8880cad1feef68aa7a8ee9ffd99a458dc1dcff3dc54ce5bf3cb07b7
agentVersion: 3.4.0-0.20241218.faf39b6f2
repository: docker.io/scylladb/scylla
agentRepository: docker.io/scylladb/scylla-manager-agent
developerMode: true
4 changes: 2 additions & 2 deletions deploy/manager-prod.yaml
Original file line number Diff line number Diff line change
@@ -251,7 +251,7 @@ spec:
serviceAccountName: scylla-manager
containers:
- name: scylla-manager
image: docker.io/scylladb/scylla-manager:3.4.0@sha256:6424c36929b39ef4e679ee7d61578b1070e28c186b23b278147fde8e391d9db1
image: docker.io/scylladb/scylla-manager:3.4.0-0.20241218.faf39b6f2
imagePullPolicy: IfNotPresent
command:
- /usr/bin/scylla-manager
@@ -283,7 +283,7 @@ metadata:
namespace: scylla-manager
spec:
version: 6.2.0
agentVersion: 3.4.0@sha256:441403aed8880cad1feef68aa7a8ee9ffd99a458dc1dcff3dc54ce5bf3cb07b7
agentVersion: 3.4.0-0.20241218.faf39b6f2
repository: docker.io/scylladb/scylla
agentRepository: docker.io/scylladb/scylla-manager-agent
developerMode: true
2 changes: 1 addition & 1 deletion deploy/manager/dev/50_manager_deployment.yaml
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ spec:
serviceAccountName: scylla-manager
containers:
- name: scylla-manager
image: docker.io/scylladb/scylla-manager:3.4.0@sha256:6424c36929b39ef4e679ee7d61578b1070e28c186b23b278147fde8e391d9db1
image: docker.io/scylladb/scylla-manager:3.4.0-0.20241218.faf39b6f2
imagePullPolicy: IfNotPresent
command:
- /usr/bin/scylla-manager
2 changes: 1 addition & 1 deletion deploy/manager/dev/50_scyllacluster.yaml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ metadata:
namespace: scylla-manager
spec:
version: 6.2.0
agentVersion: 3.4.0@sha256:441403aed8880cad1feef68aa7a8ee9ffd99a458dc1dcff3dc54ce5bf3cb07b7
agentVersion: 3.4.0-0.20241218.faf39b6f2
repository: docker.io/scylladb/scylla
agentRepository: docker.io/scylladb/scylla-manager-agent
developerMode: true
2 changes: 1 addition & 1 deletion deploy/manager/prod/50_manager_deployment.yaml
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ spec:
serviceAccountName: scylla-manager
containers:
- name: scylla-manager
image: docker.io/scylladb/scylla-manager:3.4.0@sha256:6424c36929b39ef4e679ee7d61578b1070e28c186b23b278147fde8e391d9db1
image: docker.io/scylladb/scylla-manager:3.4.0-0.20241218.faf39b6f2
imagePullPolicy: IfNotPresent
command:
- /usr/bin/scylla-manager
2 changes: 1 addition & 1 deletion deploy/manager/prod/50_scyllacluster.yaml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ metadata:
namespace: scylla-manager
spec:
version: 6.2.0
agentVersion: 3.4.0@sha256:441403aed8880cad1feef68aa7a8ee9ffd99a458dc1dcff3dc54ce5bf3cb07b7
agentVersion: 3.4.0-0.20241218.faf39b6f2
repository: docker.io/scylladb/scylla
agentRepository: docker.io/scylladb/scylla-manager-agent
developerMode: true
2 changes: 1 addition & 1 deletion examples/helm/values.cluster.yaml
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
scyllaImage:
tag: 6.2.0
agentImage:
tag: 3.4.0@sha256:441403aed8880cad1feef68aa7a8ee9ffd99a458dc1dcff3dc54ce5bf3cb07b7
tag: 3.4.0-0.20241218.faf39b6f2
# Cluster information
developerMode: true
datacenter: us-east-1
4 changes: 2 additions & 2 deletions examples/helm/values.manager.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Scylla Manager image
image:
tag: 3.4.0@sha256:6424c36929b39ef4e679ee7d61578b1070e28c186b23b278147fde8e391d9db1
tag: 3.4.0-0.20241218.faf39b6f2
# Resources allocated to Scylla Manager pods
resources:
limits:
@@ -23,7 +23,7 @@ scylla:
scyllaImage:
tag: 6.2.0
agentImage:
tag: 3.4.0@sha256:441403aed8880cad1feef68aa7a8ee9ffd99a458dc1dcff3dc54ce5bf3cb07b7
tag: 3.4.0-0.20241218.faf39b6f2
datacenter: manager-dc
racks:
- name: manager-rack
2 changes: 1 addition & 1 deletion examples/scylladb/scylla.scyllacluster.yaml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ kind: ScyllaCluster
metadata:
name: scylla
spec:
agentVersion: 3.4.0@sha256:441403aed8880cad1feef68aa7a8ee9ffd99a458dc1dcff3dc54ce5bf3cb07b7
agentVersion: 3.4.0-0.20241218.faf39b6f2
version: 6.2.0
developerMode: true
automaticOrphanedNodeCleanup: true
4 changes: 2 additions & 2 deletions helm/deploy/manager_prod.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Scylla Manager image
image:
repository: docker.io/scylladb
tag: 3.4.0@sha256:6424c36929b39ef4e679ee7d61578b1070e28c186b23b278147fde8e391d9db1
tag: 3.4.0-0.20241218.faf39b6f2
controllerImage:
repository: docker.io/scylladb
logLevel: info
@@ -22,7 +22,7 @@ scylla:
repository: docker.io/scylladb/scylla
tag: 6.2.0
agentImage:
tag: 3.4.0@sha256:441403aed8880cad1feef68aa7a8ee9ffd99a458dc1dcff3dc54ce5bf3cb07b7
tag: 3.4.0-0.20241218.faf39b6f2
repository: docker.io/scylladb/scylla-manager-agent
developerMode: true
cpuset: true
4 changes: 2 additions & 2 deletions helm/scylla-manager/values.yaml
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ fullnameOverride: ""
image:
repository: scylladb
pullPolicy: IfNotPresent
tag: 3.4.0@sha256:6424c36929b39ef4e679ee7d61578b1070e28c186b23b278147fde8e391d9db1
tag: 3.4.0-0.20241218.faf39b6f2
# Allows to customize Scylla Manager Controller image
controllerImage:
repository: scylladb
@@ -62,7 +62,7 @@ scylla:
scyllaImage:
tag: 6.2.0
agentImage:
tag: 3.4.0@sha256:441403aed8880cad1feef68aa7a8ee9ffd99a458dc1dcff3dc54ce5bf3cb07b7
tag: 3.4.0-0.20241218.faf39b6f2
datacenter: manager-dc
racks:
- name: manager-rack
2 changes: 1 addition & 1 deletion helm/scylla/values.yaml
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ scyllaImage:
agentImage:
repository: scylladb/scylla-manager-agent
# Overrides the image tag whose default is the chart appVersion.
tag: 3.4.0@sha256:441403aed8880cad1feef68aa7a8ee9ffd99a458dc1dcff3dc54ce5bf3cb07b7
tag: 3.4.0-0.20241218.faf39b6f2
serviceAccount:
# Specifies whether a service account should be created
create: true