From 8a0ef02ecbc7f972b3f1bb0efe6cb2824d4a6419 Mon Sep 17 00:00:00 2001 From: Maciej Zimnoch Date: Tue, 26 Nov 2024 12:49:52 +0100 Subject: [PATCH 1/2] Pin tags to 1.15 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c85256b1d21..80344aae22c 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ SHELL :=/bin/bash -euEo pipefail -O inherit_errexit comma :=, -IMAGE_TAG ?= latest +IMAGE_TAG ?= 1.15 IMAGE_REF ?= docker.io/scylladb/scylla-operator:$(IMAGE_TAG) MAKE_REQUIRED_MIN_VERSION:=4.2 # for SHELLSTATUS From db9262085dd76cbc602cc415217afc87eea2b568 Mon Sep 17 00:00:00 2001 From: Maciej Zimnoch Date: Tue, 26 Nov 2024 12:54:31 +0100 Subject: [PATCH 2/2] Update autogenerated --- deploy/manager-dev.yaml | 2 +- deploy/manager-prod.yaml | 2 +- deploy/manager/dev/50_controller_deployment.yaml | 2 +- deploy/manager/prod/50_controller_deployment.yaml | 2 +- deploy/operator.yaml | 6 +++--- deploy/operator/50_operator.deployment.yaml | 4 ++-- deploy/operator/50_webhookserver.deployment.yaml | 2 +- helm/scylla-manager/Chart.yaml | 2 +- helm/scylla-operator/Chart.yaml | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/deploy/manager-dev.yaml b/deploy/manager-dev.yaml index bb78a9e9e5f..61ba05202a2 100644 --- a/deploy/manager-dev.yaml +++ b/deploy/manager-dev.yaml @@ -205,7 +205,7 @@ spec: serviceAccountName: scylla-manager-controller containers: - name: scylla-manager-controller - image: docker.io/scylladb/scylla-operator:latest + image: docker.io/scylladb/scylla-operator:1.15 imagePullPolicy: IfNotPresent env: - name: POD_NAME diff --git a/deploy/manager-prod.yaml b/deploy/manager-prod.yaml index af20a24dbf3..a735fd18580 100644 --- a/deploy/manager-prod.yaml +++ b/deploy/manager-prod.yaml @@ -205,7 +205,7 @@ spec: serviceAccountName: scylla-manager-controller containers: - name: scylla-manager-controller - image: docker.io/scylladb/scylla-operator:latest + image: docker.io/scylladb/scylla-operator:1.15 imagePullPolicy: IfNotPresent env: - name: POD_NAME diff --git a/deploy/manager/dev/50_controller_deployment.yaml b/deploy/manager/dev/50_controller_deployment.yaml index 2dae01f3049..3bb07731bc2 100644 --- a/deploy/manager/dev/50_controller_deployment.yaml +++ b/deploy/manager/dev/50_controller_deployment.yaml @@ -23,7 +23,7 @@ spec: serviceAccountName: scylla-manager-controller containers: - name: scylla-manager-controller - image: docker.io/scylladb/scylla-operator:latest + image: docker.io/scylladb/scylla-operator:1.15 imagePullPolicy: IfNotPresent env: - name: POD_NAME diff --git a/deploy/manager/prod/50_controller_deployment.yaml b/deploy/manager/prod/50_controller_deployment.yaml index 2dae01f3049..3bb07731bc2 100644 --- a/deploy/manager/prod/50_controller_deployment.yaml +++ b/deploy/manager/prod/50_controller_deployment.yaml @@ -23,7 +23,7 @@ spec: serviceAccountName: scylla-manager-controller containers: - name: scylla-manager-controller - image: docker.io/scylladb/scylla-operator:latest + image: docker.io/scylladb/scylla-operator:1.15 imagePullPolicy: IfNotPresent env: - name: POD_NAME diff --git a/deploy/operator.yaml b/deploy/operator.yaml index afd88d6481f..91c331d1aaf 100644 --- a/deploy/operator.yaml +++ b/deploy/operator.yaml @@ -11228,11 +11228,11 @@ spec: serviceAccountName: scylla-operator containers: - name: scylla-operator - image: docker.io/scylladb/scylla-operator:latest + image: docker.io/scylladb/scylla-operator:1.15 imagePullPolicy: IfNotPresent env: - name: SCYLLA_OPERATOR_IMAGE - value: docker.io/scylladb/scylla-operator:latest + value: docker.io/scylladb/scylla-operator:1.15 args: - operator - --loglevel=2 @@ -11278,7 +11278,7 @@ spec: serviceAccountName: "webhook-server" containers: - name: webhook-server - image: docker.io/scylladb/scylla-operator:latest + image: docker.io/scylladb/scylla-operator:1.15 imagePullPolicy: IfNotPresent args: - run-webhook-server diff --git a/deploy/operator/50_operator.deployment.yaml b/deploy/operator/50_operator.deployment.yaml index b790fa07fcf..aeb93e6d510 100644 --- a/deploy/operator/50_operator.deployment.yaml +++ b/deploy/operator/50_operator.deployment.yaml @@ -23,11 +23,11 @@ spec: serviceAccountName: scylla-operator containers: - name: scylla-operator - image: docker.io/scylladb/scylla-operator:latest + image: docker.io/scylladb/scylla-operator:1.15 imagePullPolicy: IfNotPresent env: - name: SCYLLA_OPERATOR_IMAGE - value: docker.io/scylladb/scylla-operator:latest + value: docker.io/scylladb/scylla-operator:1.15 args: - operator - --loglevel=2 diff --git a/deploy/operator/50_webhookserver.deployment.yaml b/deploy/operator/50_webhookserver.deployment.yaml index 49f7a1adec0..90f2eb81c8a 100644 --- a/deploy/operator/50_webhookserver.deployment.yaml +++ b/deploy/operator/50_webhookserver.deployment.yaml @@ -23,7 +23,7 @@ spec: serviceAccountName: "webhook-server" containers: - name: webhook-server - image: docker.io/scylladb/scylla-operator:latest + image: docker.io/scylladb/scylla-operator:1.15 imagePullPolicy: IfNotPresent args: - run-webhook-server diff --git a/helm/scylla-manager/Chart.yaml b/helm/scylla-manager/Chart.yaml index 293f23b819a..61c8e41ae91 100644 --- a/helm/scylla-manager/Chart.yaml +++ b/helm/scylla-manager/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: scylla-manager description: Scylla Manager automates database operations. version: 0.0.0 # overwritten during publishing -appVersion: latest # overwritten during publishing +appVersion: "1.15" # overwritten during publishing dependencies: - name: scylla version: 1.0.0 diff --git a/helm/scylla-operator/Chart.yaml b/helm/scylla-operator/Chart.yaml index 4e05e7e70e8..35c24dda22e 100644 --- a/helm/scylla-operator/Chart.yaml +++ b/helm/scylla-operator/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: scylla-operator description: Scylla Operator is a Kubernetes Operator for managing and automating tasks related to managing a Scylla clusters. version: 0.0.0 # overwritten during publishing -appVersion: latest # overwritten during publishing +appVersion: "1.15" # overwritten during publishing keywords: - scylla - scylladb