From 270f43368f58c06c44ee17366e6d8054906774a1 Mon Sep 17 00:00:00 2001 From: Kacper Rzetelski Date: Thu, 4 Apr 2024 09:14:50 +0200 Subject: [PATCH 1/2] Update Scylla Manager to 3.2.7 --- docs/source/generic.md | 6 +++--- docs/source/multidc/multidc.md | 4 ++-- docs/source/nodeoperations/restore.md | 4 ++-- docs/source/performance.md | 2 +- examples/eks/cluster.yaml | 2 +- examples/generic/cluster.yaml | 2 +- examples/gke/cluster.yaml | 2 +- examples/helm/values.cluster.yaml | 2 +- examples/helm/values.manager.yaml | 4 ++-- examples/scylladb/scylla.scyllacluster.yaml | 2 +- helm/deploy/manager_prod.yaml | 2 +- helm/scylla-manager/values.yaml | 4 ++-- helm/scylla/values.yaml | 2 +- test/e2e/fixture/scylla/scyllacluster.yaml.tmpl | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/source/generic.md b/docs/source/generic.md index cc9ac65e035..2a72a983c71 100644 --- a/docs/source/generic.md +++ b/docs/source/generic.md @@ -144,7 +144,7 @@ To enable this the CRD allows for specifying a `network` parameter as such: ```yaml version: 5.4.3 - agentVersion: 3.2.6 + agentVersion: 3.2.7 cpuset: true network: hostNetworking: true @@ -172,7 +172,7 @@ This requires a small change in the cluster definition. Change the `cluster.yaml` file from this: ```yaml spec: - agentVersion: 3.2.6 + agentVersion: 3.2.7 version: 5.4.3 developerMode: true datacenter: @@ -185,7 +185,7 @@ spec: alternator: port: 8000 writeIsolation: only_rmw_uses_lwt - agentVersion: 3.2.6 + agentVersion: 3.2.7 developerMode: true datacenter: name: us-east-1 diff --git a/docs/source/multidc/multidc.md b/docs/source/multidc/multidc.md index 6a65cb178c1..6de366d44a3 100644 --- a/docs/source/multidc/multidc.md +++ b/docs/source/multidc/multidc.md @@ -107,7 +107,7 @@ metadata: name: scylla-cluster namespace: scylla spec: - agentVersion: 3.2.6 + agentVersion: 3.2.7 version: 5.4.3 cpuset: true sysctls: @@ -357,7 +357,7 @@ metadata: name: scylla-cluster namespace: scylla spec: - agentVersion: 3.2.6 + agentVersion: 3.2.7 version: 5.4.3 cpuset: true sysctls: diff --git a/docs/source/nodeoperations/restore.md b/docs/source/nodeoperations/restore.md index 2bfe6d4a732..4aeee79959e 100644 --- a/docs/source/nodeoperations/restore.md +++ b/docs/source/nodeoperations/restore.md @@ -21,7 +21,7 @@ kind: ScyllaCluster metadata: name: source spec: - agentVersion: 3.2.6 + agentVersion: 3.2.7 version: 5.4.1 developerMode: true backups: @@ -50,7 +50,7 @@ kind: ScyllaCluster metadata: name: target spec: - agentVersion: 3.2.6 + agentVersion: 3.2.7 version: 5.4.1 developerMode: true datacenter: diff --git a/docs/source/performance.md b/docs/source/performance.md index bf8d6e81f17..5d0bda0b44e 100644 --- a/docs/source/performance.md +++ b/docs/source/performance.md @@ -69,7 +69,7 @@ metadata: name: guaranteed-cluster namespace: scylla spec: - agentVersion: 3.2.6 + agentVersion: 3.2.7 version: 5.4.3 datacenter: name: us-east-1 diff --git a/examples/eks/cluster.yaml b/examples/eks/cluster.yaml index 5b4acb6be8a..5dff8df989f 100644 --- a/examples/eks/cluster.yaml +++ b/examples/eks/cluster.yaml @@ -13,7 +13,7 @@ metadata: name: scylla-cluster namespace: scylla spec: - agentVersion: 3.2.6 + agentVersion: 3.2.7 version: 5.4.3 cpuset: true network: diff --git a/examples/generic/cluster.yaml b/examples/generic/cluster.yaml index c710277aef6..f9a7a041f8e 100644 --- a/examples/generic/cluster.yaml +++ b/examples/generic/cluster.yaml @@ -15,7 +15,7 @@ metadata: name: simple-cluster namespace: scylla spec: - agentVersion: 3.2.6 + agentVersion: 3.2.7 version: 5.4.3 developerMode: true datacenter: diff --git a/examples/gke/cluster.yaml b/examples/gke/cluster.yaml index 9b2270f2872..5f980cbeabc 100644 --- a/examples/gke/cluster.yaml +++ b/examples/gke/cluster.yaml @@ -13,7 +13,7 @@ metadata: name: scylla-cluster namespace: scylla spec: - agentVersion: 3.2.6 + agentVersion: 3.2.7 version: 5.4.3 cpuset: true automaticOrphanedNodeCleanup: true diff --git a/examples/helm/values.cluster.yaml b/examples/helm/values.cluster.yaml index da7b1e7a9b6..0e7f6fdd193 100644 --- a/examples/helm/values.cluster.yaml +++ b/examples/helm/values.cluster.yaml @@ -2,7 +2,7 @@ scyllaImage: tag: 5.4.3 agentImage: - tag: 3.2.6 + tag: 3.2.7 # Cluster information developerMode: true diff --git a/examples/helm/values.manager.yaml b/examples/helm/values.manager.yaml index a02ffa5405d..1b86c302127 100644 --- a/examples/helm/values.manager.yaml +++ b/examples/helm/values.manager.yaml @@ -1,6 +1,6 @@ # Scylla Manager image image: - tag: 3.2.6 + tag: 3.2.7 # Resources allocated to Scylla Manager pods resources: @@ -25,7 +25,7 @@ scylla: scyllaImage: tag: 5.4.3 agentImage: - tag: 3.2.6 + tag: 3.2.7 datacenter: manager-dc racks: - name: manager-rack diff --git a/examples/scylladb/scylla.scyllacluster.yaml b/examples/scylladb/scylla.scyllacluster.yaml index cfea3e81685..4793f814223 100644 --- a/examples/scylladb/scylla.scyllacluster.yaml +++ b/examples/scylladb/scylla.scyllacluster.yaml @@ -3,7 +3,7 @@ kind: ScyllaCluster metadata: name: scylla spec: - agentVersion: 3.2.6 + agentVersion: 3.2.7 version: 5.4.3 developerMode: true automaticOrphanedNodeCleanup: true diff --git a/helm/deploy/manager_prod.yaml b/helm/deploy/manager_prod.yaml index c223825648e..100d6f09624 100644 --- a/helm/deploy/manager_prod.yaml +++ b/helm/deploy/manager_prod.yaml @@ -25,7 +25,7 @@ scylla: repository: docker.io/scylladb/scylla tag: 5.4.3 agentImage: - tag: 3.2.6 + tag: 3.2.7 repository: docker.io/scylladb/scylla-manager-agent developerMode: true cpuset: true diff --git a/helm/scylla-manager/values.yaml b/helm/scylla-manager/values.yaml index 0e779f18c2f..c93a57362b8 100644 --- a/helm/scylla-manager/values.yaml +++ b/helm/scylla-manager/values.yaml @@ -7,7 +7,7 @@ fullnameOverride: "" image: repository: scylladb pullPolicy: IfNotPresent - tag: 3.2.6 + tag: 3.2.7 # Allows to customize Scylla Manager Controller image controllerImage: @@ -75,7 +75,7 @@ scylla: scyllaImage: tag: 5.4.3 agentImage: - tag: 3.2.6 + tag: 3.2.7 datacenter: manager-dc racks: - name: manager-rack diff --git a/helm/scylla/values.yaml b/helm/scylla/values.yaml index d1f8994d9e8..75ee8552cd4 100644 --- a/helm/scylla/values.yaml +++ b/helm/scylla/values.yaml @@ -12,7 +12,7 @@ scyllaImage: agentImage: repository: scylladb/scylla-manager-agent # Overrides the image tag whose default is the chart appVersion. - tag: 3.2.6 + tag: 3.2.7 serviceAccount: # Specifies whether a service account should be created diff --git a/test/e2e/fixture/scylla/scyllacluster.yaml.tmpl b/test/e2e/fixture/scylla/scyllacluster.yaml.tmpl index faa698575a1..58ecdf38e25 100644 --- a/test/e2e/fixture/scylla/scyllacluster.yaml.tmpl +++ b/test/e2e/fixture/scylla/scyllacluster.yaml.tmpl @@ -7,7 +7,7 @@ metadata: annotations: bar: foo spec: - agentVersion: 3.2.6 + agentVersion: 3.2.7 version: 5.4.3 developerMode: true exposeOptions: From 714ad383936d971f960c460b09976d46b95fa4bd Mon Sep 17 00:00:00 2001 From: Kacper Rzetelski Date: Thu, 4 Apr 2024 09:16:20 +0200 Subject: [PATCH 2/2] Update generated --- deploy/manager-dev.yaml | 4 ++-- deploy/manager-prod.yaml | 4 ++-- deploy/manager/dev/50_manager_deployment.yaml | 2 +- deploy/manager/dev/50_scyllacluster.yaml | 2 +- deploy/manager/prod/50_manager_deployment.yaml | 2 +- deploy/manager/prod/50_scyllacluster.yaml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/deploy/manager-dev.yaml b/deploy/manager-dev.yaml index 48c8e4dbcd8..c30f420dcd9 100644 --- a/deploy/manager-dev.yaml +++ b/deploy/manager-dev.yaml @@ -251,7 +251,7 @@ spec: serviceAccountName: scylla-manager containers: - name: scylla-manager - image: docker.io/scylladb/scylla-manager:3.2.6 + image: docker.io/scylladb/scylla-manager:3.2.7 imagePullPolicy: IfNotPresent command: - /usr/bin/scylla-manager @@ -283,7 +283,7 @@ metadata: namespace: scylla-manager spec: version: 5.4.3 - agentVersion: 3.2.6 + agentVersion: 3.2.7 repository: docker.io/scylladb/scylla agentRepository: docker.io/scylladb/scylla-manager-agent developerMode: true diff --git a/deploy/manager-prod.yaml b/deploy/manager-prod.yaml index 23295a46bf6..eea27bc2d25 100644 --- a/deploy/manager-prod.yaml +++ b/deploy/manager-prod.yaml @@ -251,7 +251,7 @@ spec: serviceAccountName: scylla-manager containers: - name: scylla-manager - image: docker.io/scylladb/scylla-manager:3.2.6 + image: docker.io/scylladb/scylla-manager:3.2.7 imagePullPolicy: IfNotPresent command: - /usr/bin/scylla-manager @@ -283,7 +283,7 @@ metadata: namespace: scylla-manager spec: version: 5.4.3 - agentVersion: 3.2.6 + agentVersion: 3.2.7 repository: docker.io/scylladb/scylla agentRepository: docker.io/scylladb/scylla-manager-agent developerMode: true diff --git a/deploy/manager/dev/50_manager_deployment.yaml b/deploy/manager/dev/50_manager_deployment.yaml index 735abe0dbd3..510ea978d6b 100644 --- a/deploy/manager/dev/50_manager_deployment.yaml +++ b/deploy/manager/dev/50_manager_deployment.yaml @@ -23,7 +23,7 @@ spec: serviceAccountName: scylla-manager containers: - name: scylla-manager - image: docker.io/scylladb/scylla-manager:3.2.6 + image: docker.io/scylladb/scylla-manager:3.2.7 imagePullPolicy: IfNotPresent command: - /usr/bin/scylla-manager diff --git a/deploy/manager/dev/50_scyllacluster.yaml b/deploy/manager/dev/50_scyllacluster.yaml index 6dbfcbb253a..8b7204ed03e 100644 --- a/deploy/manager/dev/50_scyllacluster.yaml +++ b/deploy/manager/dev/50_scyllacluster.yaml @@ -5,7 +5,7 @@ metadata: namespace: scylla-manager spec: version: 5.4.3 - agentVersion: 3.2.6 + agentVersion: 3.2.7 repository: docker.io/scylladb/scylla agentRepository: docker.io/scylladb/scylla-manager-agent developerMode: true diff --git a/deploy/manager/prod/50_manager_deployment.yaml b/deploy/manager/prod/50_manager_deployment.yaml index 735abe0dbd3..510ea978d6b 100644 --- a/deploy/manager/prod/50_manager_deployment.yaml +++ b/deploy/manager/prod/50_manager_deployment.yaml @@ -23,7 +23,7 @@ spec: serviceAccountName: scylla-manager containers: - name: scylla-manager - image: docker.io/scylladb/scylla-manager:3.2.6 + image: docker.io/scylladb/scylla-manager:3.2.7 imagePullPolicy: IfNotPresent command: - /usr/bin/scylla-manager diff --git a/deploy/manager/prod/50_scyllacluster.yaml b/deploy/manager/prod/50_scyllacluster.yaml index ed9327e5cc9..60c01d6570e 100644 --- a/deploy/manager/prod/50_scyllacluster.yaml +++ b/deploy/manager/prod/50_scyllacluster.yaml @@ -5,7 +5,7 @@ metadata: namespace: scylla-manager spec: version: 5.4.3 - agentVersion: 3.2.6 + agentVersion: 3.2.7 repository: docker.io/scylladb/scylla agentRepository: docker.io/scylladb/scylla-manager-agent developerMode: true