From b7e743b7bb108668c4911e702a9fd7a7140335b5 Mon Sep 17 00:00:00 2001 From: Tomas Nozicka Date: Thu, 9 Sep 2021 13:37:02 +0200 Subject: [PATCH 1/2] Pin tags to 1.5 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 69f3cc4315c..578710f701c 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ all: build SHELL :=/bin/bash -euEo pipefail -IMAGE_TAG ?= latest +IMAGE_TAG ?= 1.5 IMAGE_REF ?= docker.io/scylladb/scylla-operator:$(IMAGE_TAG) CODEGEN_PKG ?=./vendor/k8s.io/code-generator From a05b6a652f60e6c5ebd386fe6612f9912da4c968 Mon Sep 17 00:00:00 2001 From: Tomas Nozicka Date: Thu, 9 Sep 2021 13:38:04 +0200 Subject: [PATCH 2/2] Update generated --- deploy/manager/dev/50_controller_deployment.yaml | 2 +- deploy/manager/prod/50_controller_deployment.yaml | 2 +- deploy/operator/50_operator.deployment.yaml | 4 ++-- deploy/operator/50_webhookserver.deployment.yaml | 2 +- examples/common/manager.yaml | 2 +- examples/common/operator.yaml | 6 +++--- helm/scylla-manager/Chart.yaml | 2 +- helm/scylla-operator/Chart.yaml | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/deploy/manager/dev/50_controller_deployment.yaml b/deploy/manager/dev/50_controller_deployment.yaml index 2dae01f3049..fbdc981fcbc 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.5 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..fbdc981fcbc 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.5 imagePullPolicy: IfNotPresent env: - name: POD_NAME diff --git a/deploy/operator/50_operator.deployment.yaml b/deploy/operator/50_operator.deployment.yaml index 8543863de0d..f57d50519b6 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.5 imagePullPolicy: IfNotPresent env: - name: SCYLLA_OPERATOR_IMAGE - value: docker.io/scylladb/scylla-operator:latest + value: docker.io/scylladb/scylla-operator:1.5 args: - operator - --loglevel=2 diff --git a/deploy/operator/50_webhookserver.deployment.yaml b/deploy/operator/50_webhookserver.deployment.yaml index c52999a11ef..541fffe7baa 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.5 imagePullPolicy: IfNotPresent args: - run-webhook-server diff --git a/examples/common/manager.yaml b/examples/common/manager.yaml index 1d15e13db93..467a47c842f 100644 --- a/examples/common/manager.yaml +++ b/examples/common/manager.yaml @@ -231,7 +231,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.5 imagePullPolicy: IfNotPresent env: - name: POD_NAME diff --git a/examples/common/operator.yaml b/examples/common/operator.yaml index 76869a13fd8..a9ef32fa51e 100644 --- a/examples/common/operator.yaml +++ b/examples/common/operator.yaml @@ -3766,11 +3766,11 @@ spec: serviceAccountName: scylla-operator containers: - name: scylla-operator - image: docker.io/scylladb/scylla-operator:latest + image: docker.io/scylladb/scylla-operator:1.5 imagePullPolicy: IfNotPresent env: - name: SCYLLA_OPERATOR_IMAGE - value: docker.io/scylladb/scylla-operator:latest + value: docker.io/scylladb/scylla-operator:1.5 args: - operator - --loglevel=2 @@ -3816,7 +3816,7 @@ spec: serviceAccountName: "webhook-server" containers: - name: webhook-server - image: docker.io/scylladb/scylla-operator:latest + image: docker.io/scylladb/scylla-operator:1.5 imagePullPolicy: IfNotPresent args: - run-webhook-server diff --git a/helm/scylla-manager/Chart.yaml b/helm/scylla-manager/Chart.yaml index 293f23b819a..52b215b9a76 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.5" # 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..9678988a48c 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.5" # overwritten during publishing keywords: - scylla - scylladb