Merge pull request #776 from tnozicka/init-1.5-branch

[v1.5] Init v1.5 branch
scylladb · Sep 9, 2021 · cbb0f53 · cbb0f53
2 parents 71f335a + a05b6a6
commit cbb0f53
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git 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

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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