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

Update ScyllaDB versions to 6.1.1 and 2024.1.8 #2103

Merged
merged 2 commits into from
Sep 3, 2024
Merged
Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions assets/config/config.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
operator:
scyllaDBVersion: "6.1.0"
scyllaDBVersion: "6.1.1"
# scyllaDBEnterpriseVersionNeedingConsistentClusterManagementOverride sets enterprise version
# that requires consistent_cluster_management workaround for restore.
# In the future, enterprise versions should be run as a different config instance in its own run.
scyllaDBEnterpriseVersionNeedingConsistentClusterManagementOverride: "2024.1.7"
scyllaDBEnterpriseVersionNeedingConsistentClusterManagementOverride: "2024.1.8"
# TODO: scyllaDBUtils image can't be bumped until scylladb/scylladb#17787 is fixed.
scyllaDBUtilsImage: "docker.io/scylladb/scylla:5.4.0@sha256:b9070afdb2be0d5c59b1c196e1bb66660351403cb30d5c6ba446ef8c3b0754f1"
scyllaDBManagerVersion: "3.3.0"
Expand All @@ -12,6 +12,6 @@ operator:
prometheusVersion: "v2.44.0"
operatorTests:
scyllaDBVersions:
updateFrom: "6.1.0-rc1"
updateFrom: "6.1.0"
upgradeFrom: "6.0.2"
nodeSetupImage: "quay.io/scylladb/scylla-operator-images:node-setup-v0.0.2@sha256:210b1dd9bd60a5bf4056783f3132bdeef0cf9ab0a19eff0b620b2dfa5c4e5d61"
2 changes: 1 addition & 1 deletion deploy/manager-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ metadata:
name: scylla-manager-cluster
namespace: scylla-manager
spec:
version: 6.1.0
version: 6.1.1
agentVersion: 3.3.0
repository: docker.io/scylladb/scylla
agentRepository: docker.io/scylladb/scylla-manager-agent
Expand Down
2 changes: 1 addition & 1 deletion deploy/manager-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ metadata:
name: scylla-manager-cluster
namespace: scylla-manager
spec:
version: 6.1.0
version: 6.1.1
agentVersion: 3.3.0
repository: docker.io/scylladb/scylla
agentRepository: docker.io/scylladb/scylla-manager-agent
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 @@ -4,7 +4,7 @@ metadata:
name: scylla-manager-cluster
namespace: scylla-manager
spec:
version: 6.1.0
version: 6.1.1
agentVersion: 3.3.0
repository: docker.io/scylladb/scylla
agentRepository: docker.io/scylladb/scylla-manager-agent
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 @@ -4,7 +4,7 @@ metadata:
name: scylla-manager-cluster
namespace: scylla-manager
spec:
version: 6.1.0
version: 6.1.1
agentVersion: 3.3.0
repository: docker.io/scylladb/scylla
agentRepository: docker.io/scylladb/scylla-manager-agent
Expand Down
4 changes: 2 additions & 2 deletions docs/source/generic.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,15 +159,15 @@ Change the `cluster.yaml` file from this:
```yaml
spec:
agentVersion: 3.3.0
version: 6.1.0
version: 6.1.1
developerMode: true
datacenter:
name: us-east-1
```
to this:
```yaml
spec:
version: 6.1.0
version: 6.1.1
alternator:
port: 8000
writeIsolation: only_rmw_uses_lwt
Expand Down
4 changes: 2 additions & 2 deletions docs/source/multidc/multidc.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ metadata:
namespace: scylla
spec:
agentVersion: 3.3.0
version: 6.1.0
version: 6.1.1
cpuset: true
sysctls:
- "fs.aio-max-nr=2097152"
Expand Down Expand Up @@ -358,7 +358,7 @@ metadata:
namespace: scylla
spec:
agentVersion: 3.3.0
version: 6.1.0
version: 6.1.1
cpuset: true
sysctls:
- "fs.aio-max-nr=2097152"
Expand Down
4 changes: 2 additions & 2 deletions docs/source/nodeoperations/restore.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ metadata:
name: source
spec:
agentVersion: 3.3.0
version: 6.1.0
version: 6.1.1
developerMode: true
backups:
- name: foo
Expand Down Expand Up @@ -51,7 +51,7 @@ metadata:
name: target
spec:
agentVersion: 3.3.0
version: 6.1.0
version: 6.1.1
developerMode: true
datacenter:
name: us-east-1
Expand Down
2 changes: 1 addition & 1 deletion docs/source/performance.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ metadata:
namespace: scylla
spec:
agentVersion: 3.3.0
version: 6.1.0
version: 6.1.1
datacenter:
name: us-east-1
racks:
Expand Down
2 changes: 1 addition & 1 deletion examples/eks/cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ metadata:
namespace: scylla
spec:
agentVersion: 3.3.0
version: 6.1.0
version: 6.1.1
sysctls:
- fs.aio-max-nr=2097152
datacenter:
Expand Down
2 changes: 1 addition & 1 deletion examples/generic/cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ metadata:
namespace: scylla
spec:
agentVersion: 3.3.0
version: 6.1.0
version: 6.1.1
developerMode: true
datacenter:
name: us-east-1
Expand Down
2 changes: 1 addition & 1 deletion examples/gke/cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ metadata:
namespace: scylla
spec:
agentVersion: 3.3.0
version: 6.1.0
version: 6.1.1
automaticOrphanedNodeCleanup: true
sysctls:
- fs.aio-max-nr=2097152
Expand Down
2 changes: 1 addition & 1 deletion examples/helm/values.cluster.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Version information
scyllaImage:
tag: 6.1.0
tag: 6.1.1
agentImage:
tag: 3.3.0
# Cluster information
Expand Down
2 changes: 1 addition & 1 deletion examples/helm/values.manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ controllerResources:
scylla:
developerMode: true
scyllaImage:
tag: 6.1.0
tag: 6.1.1
agentImage:
tag: 3.3.0
datacenter: manager-dc
Expand Down
2 changes: 1 addition & 1 deletion examples/scylladb/scylla.scyllacluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: scylla
spec:
agentVersion: 3.3.0
version: 6.1.0
version: 6.1.1
developerMode: true
automaticOrphanedNodeCleanup: true
sysctls:
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 @@ -19,7 +19,7 @@ scylla:
fullnameOverride: scylla-manager-cluster
scyllaImage:
repository: docker.io/scylladb/scylla
tag: 6.1.0
tag: 6.1.1
agentImage:
tag: 3.3.0
repository: docker.io/scylladb/scylla-manager-agent
Expand Down
2 changes: 1 addition & 1 deletion helm/scylla-manager/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ controllerServiceAccount:
scylla:
developerMode: true
scyllaImage:
tag: 6.1.0
tag: 6.1.1
agentImage:
tag: 3.3.0
datacenter: manager-dc
Expand Down
2 changes: 1 addition & 1 deletion helm/scylla/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ fullnameOverride: ""
scyllaImage:
repository: scylladb/scylla
# Overrides the image tag whose default is the chart appVersion.
tag: 6.1.0
tag: 6.1.1
# Allows to customize Scylla image
agentImage:
repository: scylladb/scylla-manager-agent
Expand Down