Merge pull request #2090 from rzetelskik/scylla-6.1.0

Update ScyllaDB versions to 6.1.0 and 2024.1.7
scylladb · Aug 23, 2024 · 1fb54b6 · 1fb54b6
2 parents 6b54d8d + 3a08d04
commit 1fb54b6
Show file tree

Hide file tree

Showing 21 changed files with 27 additions and 27 deletions.
diff --git a/deploy/manager-dev.yaml b/deploy/manager-dev.yaml
@@ -282,7 +282,7 @@ metadata:
   name: scylla-manager-cluster
   namespace: scylla-manager
 spec:
-  version: 5.4.3
+  version: 6.1.0
   agentVersion: 3.3.0
   repository: docker.io/scylladb/scylla
   agentRepository: docker.io/scylladb/scylla-manager-agent

diff --git a/deploy/manager-prod.yaml b/deploy/manager-prod.yaml
@@ -282,7 +282,7 @@ metadata:
   name: scylla-manager-cluster
   namespace: scylla-manager
 spec:
-  version: 5.4.3
+  version: 6.1.0
   agentVersion: 3.3.0
   repository: docker.io/scylladb/scylla
   agentRepository: docker.io/scylladb/scylla-manager-agent

diff --git a/deploy/manager/dev/50_scyllacluster.yaml b/deploy/manager/dev/50_scyllacluster.yaml
@@ -4,7 +4,7 @@ metadata:
   name: scylla-manager-cluster
   namespace: scylla-manager
 spec:
-  version: 5.4.3
+  version: 6.1.0
   agentVersion: 3.3.0
   repository: docker.io/scylladb/scylla
   agentRepository: docker.io/scylladb/scylla-manager-agent

diff --git a/deploy/manager/prod/50_scyllacluster.yaml b/deploy/manager/prod/50_scyllacluster.yaml
@@ -4,7 +4,7 @@ metadata:
   name: scylla-manager-cluster
   namespace: scylla-manager
 spec:
-  version: 5.4.3
+  version: 6.1.0
   agentVersion: 3.3.0
   repository: docker.io/scylladb/scylla
   agentRepository: docker.io/scylladb/scylla-manager-agent

diff --git a/docs/source/generic.md b/docs/source/generic.md
@@ -159,15 +159,15 @@ Change the `cluster.yaml` file from this:
 ```yaml
 spec:
   agentVersion: 3.3.0
-  version: 5.4.3
+  version: 6.1.0
   developerMode: true
   datacenter:
     name: us-east-1
 ```
 to this:
 ```yaml
 spec:
-  version: 5.4.3
+  version: 6.1.0
   alternator:
     port: 8000
     writeIsolation: only_rmw_uses_lwt

diff --git a/docs/source/multidc/multidc.md b/docs/source/multidc/multidc.md
@@ -108,7 +108,7 @@ metadata:
   namespace: scylla
 spec:
   agentVersion: 3.3.0
-  version: 5.4.3
+  version: 6.1.0
   cpuset: true
   sysctls:
   - "fs.aio-max-nr=2097152"
@@ -358,7 +358,7 @@ metadata:
   namespace: scylla
 spec:
   agentVersion: 3.3.0
-  version: 5.4.3
+  version: 6.1.0
   cpuset: true
   sysctls:
   - "fs.aio-max-nr=2097152"

diff --git a/docs/source/nodeoperations/restore.md b/docs/source/nodeoperations/restore.md
@@ -22,7 +22,7 @@ metadata:
   name: source
 spec:
   agentVersion: 3.3.0
-  version: 5.4.1
+  version: 6.1.0
   developerMode: true
   backups:
   - name: foo
@@ -51,7 +51,7 @@ metadata:
   name: target
 spec:
   agentVersion: 3.3.0
-  version: 5.4.1
+  version: 6.1.0
   developerMode: true
   datacenter:
     name: us-east-1

diff --git a/docs/source/performance.md b/docs/source/performance.md
@@ -75,7 +75,7 @@ metadata:
   namespace: scylla
 spec:
   agentVersion: 3.3.0
-  version: 5.4.3
+  version: 6.1.0
   datacenter:
     name: us-east-1
     racks:

diff --git a/examples/eks/cluster.yaml b/examples/eks/cluster.yaml
@@ -14,7 +14,7 @@ metadata:
   namespace: scylla
 spec:
   agentVersion: 3.3.0
-  version: 5.4.3
+  version: 6.1.0
   sysctls:
   - "fs.aio-max-nr=2097152"
   datacenter:

diff --git a/examples/generic/cluster.yaml b/examples/generic/cluster.yaml
@@ -16,7 +16,7 @@ metadata:
   namespace: scylla
 spec:
   agentVersion: 3.3.0
-  version: 5.4.3
+  version: 6.1.0
   developerMode: true
   datacenter:
     name: us-east-1

diff --git a/examples/gke/cluster.yaml b/examples/gke/cluster.yaml
@@ -14,7 +14,7 @@ metadata:
   namespace: scylla
 spec:
   agentVersion: 3.3.0
-  version: 5.4.3
+  version: 6.1.0
   automaticOrphanedNodeCleanup: true
   sysctls:
     - "fs.aio-max-nr=2097152"

diff --git a/examples/helm/values.cluster.yaml b/examples/helm/values.cluster.yaml
@@ -1,6 +1,6 @@
 # Version information
 scyllaImage:
-  tag: 5.4.3
+  tag: 6.1.0
 agentImage:
   tag: 3.3.0
 

diff --git a/examples/helm/values.manager.yaml b/examples/helm/values.manager.yaml
@@ -23,7 +23,7 @@ controllerResources:
 scylla:
   developerMode: true
   scyllaImage:
-    tag: 5.4.3
+    tag: 6.1.0
   agentImage:
     tag: 3.3.0
   datacenter: manager-dc

diff --git a/examples/scylladb/scylla.scyllacluster.yaml b/examples/scylladb/scylla.scyllacluster.yaml
@@ -4,7 +4,7 @@ metadata:
   name: scylla
 spec:
   agentVersion: 3.3.0
-  version: 5.4.3
+  version: 6.1.0
   developerMode: true
   automaticOrphanedNodeCleanup: true
   sysctls:

diff --git a/helm/deploy/manager_prod.yaml b/helm/deploy/manager_prod.yaml
@@ -23,7 +23,7 @@ scylla:
   fullnameOverride: scylla-manager-cluster
   scyllaImage:
     repository: docker.io/scylladb/scylla
-    tag: 5.4.3
+    tag: 6.1.0
   agentImage:
     tag: 3.3.0
     repository: docker.io/scylladb/scylla-manager-agent

diff --git a/helm/scylla-manager/values.yaml b/helm/scylla-manager/values.yaml
@@ -73,7 +73,7 @@ controllerServiceAccount:
 scylla:
   developerMode: true
   scyllaImage:
-    tag: 5.4.3
+    tag: 6.1.0
   agentImage:
     tag: 3.3.0
   datacenter: manager-dc

diff --git a/helm/scylla/values.yaml b/helm/scylla/values.yaml
@@ -7,7 +7,7 @@ fullnameOverride: ""
 scyllaImage:
   repository: scylladb/scylla
   # Overrides the image tag whose default is the chart appVersion.
-  tag: 5.4.3
+  tag: 6.1.0
 # Allows to customize Scylla image
 agentImage:
   repository: scylladb/scylla-manager-agent

diff --git a/test/e2e/fixture/scylla/scyllacluster.yaml.tmpl b/test/e2e/fixture/scylla/scyllacluster.yaml.tmpl
@@ -8,7 +8,7 @@ metadata:
    bar: foo
 spec:
   agentVersion: 3.3.0
-  version: 6.0.1
+  version: 6.1.0
   developerMode: true
   exposeOptions:
     nodeService:

diff --git a/test/e2e/fixture/scylla/zonal.scyllacluster.yaml.tmpl b/test/e2e/fixture/scylla/zonal.scyllacluster.yaml.tmpl
@@ -8,7 +8,7 @@ metadata:
    bar: foo
 spec:
   agentVersion: 3.3.0
-  version: 5.4.3
+  version: 6.1.0
   developerMode: true
   exposeOptions:
     nodeService:

diff --git a/test/e2e/set/scyllacluster/config.go b/test/e2e/set/scyllacluster/config.go
@@ -5,10 +5,10 @@ import (
 )
 
 const (
-	updateFromScyllaVersion  = "6.0.0"
-	updateToScyllaVersion    = "6.0.1"
-	upgradeFromScyllaVersion = "5.4.7"
-	upgradeToScyllaVersion   = "6.0.1"
+	updateFromScyllaVersion  = "6.0.1"
+	updateToScyllaVersion    = "6.0.2"
+	upgradeFromScyllaVersion = "6.0.2"
+	upgradeToScyllaVersion   = "6.1.0"
 
 	testTimeout = 45 * time.Minute
 

diff --git a/test/e2e/set/scyllacluster/scyllamanager_object_storage.go b/test/e2e/set/scyllacluster/scyllamanager_object_storage.go
@@ -457,7 +457,7 @@ var _ = g.Describe("Scylla Manager integration", framework.RequiresObjectStorage
 		// This test validates a workaround explained in the docs - https://operator.docs.scylladb.com/stable/nodeoperations/restore.html
 		g.Entry("using workaround for consistent_cluster_management for ScyllaDB Enterprise 2024.1.X", entry{
 			scyllaRepository: "docker.io/scylladb/scylla-enterprise",
-			scyllaVersion:    "2024.1.5",
+			scyllaVersion:    "2024.1.7",
 			preTargetClusterCreateHook: func(targetCluster *scyllav1.ScyllaCluster) {
 				targetCluster.Spec.ScyllaArgs = "--consistent-cluster-management=false"
 			},