Skip to content

Commit f382529

Browse files
authored
Merge pull request #709 from tnozicka/init-1.4-branch
[v1.4] Initialize v1.4 branch
2 parents 98d464b + 796b2cc commit f382529

File tree

9 files changed

+12
-12
lines changed

9 files changed

+12
-12
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ all: build
22

33
SHELL :=/bin/bash -euEo pipefail
44

5-
IMAGE_TAG ?= latest
5+
IMAGE_TAG ?=1.4
66
IMAGE_REF ?= docker.io/scylladb/scylla-operator:$(IMAGE_TAG)
77

88
CODEGEN_PKG ?=./vendor/k8s.io/code-generator

deploy/manager/dev/50_controller_deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
serviceAccountName: scylla-manager-controller
2424
containers:
2525
- name: scylla-manager-controller
26-
image: docker.io/scylladb/scylla-operator:latest
26+
image: docker.io/scylladb/scylla-operator:1.4
2727
imagePullPolicy: IfNotPresent
2828
env:
2929
- name: POD_NAME

deploy/manager/prod/50_controller_deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
serviceAccountName: scylla-manager-controller
2424
containers:
2525
- name: scylla-manager-controller
26-
image: docker.io/scylladb/scylla-operator:latest
26+
image: docker.io/scylladb/scylla-operator:1.4
2727
imagePullPolicy: IfNotPresent
2828
env:
2929
- name: POD_NAME

deploy/operator/50_operator.deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ spec:
2323
serviceAccountName: scylla-operator
2424
containers:
2525
- name: scylla-operator
26-
image: docker.io/scylladb/scylla-operator:latest
26+
image: docker.io/scylladb/scylla-operator:1.4
2727
imagePullPolicy: IfNotPresent
2828
env:
2929
- name: SCYLLA_OPERATOR_IMAGE
30-
value: docker.io/scylladb/scylla-operator:latest
30+
value: docker.io/scylladb/scylla-operator:1.4
3131
args:
3232
- operator
3333
- --loglevel=2

deploy/operator/50_webhookserver.deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
serviceAccountName: "webhook-server"
2424
containers:
2525
- name: webhook-server
26-
image: docker.io/scylladb/scylla-operator:latest
26+
image: docker.io/scylladb/scylla-operator:1.4
2727
imagePullPolicy: IfNotPresent
2828
args:
2929
- run-webhook-server

examples/common/manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ spec:
231231
serviceAccountName: scylla-manager-controller
232232
containers:
233233
- name: scylla-manager-controller
234-
image: docker.io/scylladb/scylla-operator:latest
234+
image: docker.io/scylladb/scylla-operator:1.4
235235
imagePullPolicy: IfNotPresent
236236
env:
237237
- name: POD_NAME

examples/common/operator.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3720,11 +3720,11 @@ spec:
37203720
serviceAccountName: scylla-operator
37213721
containers:
37223722
- name: scylla-operator
3723-
image: docker.io/scylladb/scylla-operator:latest
3723+
image: docker.io/scylladb/scylla-operator:1.4
37243724
imagePullPolicy: IfNotPresent
37253725
env:
37263726
- name: SCYLLA_OPERATOR_IMAGE
3727-
value: docker.io/scylladb/scylla-operator:latest
3727+
value: docker.io/scylladb/scylla-operator:1.4
37283728
args:
37293729
- operator
37303730
- --loglevel=2
@@ -3760,7 +3760,7 @@ spec:
37603760
serviceAccountName: "webhook-server"
37613761
containers:
37623762
- name: webhook-server
3763-
image: docker.io/scylladb/scylla-operator:latest
3763+
image: docker.io/scylladb/scylla-operator:1.4
37643764
imagePullPolicy: IfNotPresent
37653765
args:
37663766
- run-webhook-server

helm/scylla-manager/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: scylla-manager
33
description: Scylla Manager automates database operations.
44
version: 0.0.0 # overwritten during publishing
5-
appVersion: latest # overwritten during publishing
5+
appVersion: "1.4" # overwritten during publishing
66
dependencies:
77
- name: scylla
88
version: 1.0.0

helm/scylla-operator/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: scylla-operator
33
description: Scylla Operator is a Kubernetes Operator for managing and automating tasks related to managing a Scylla clusters.
44
version: 0.0.0 # overwritten during publishing
5-
appVersion: latest # overwritten during publishing
5+
appVersion: "1.4" # overwritten during publishing
66
keywords:
77
- scylla
88
- scylladb

0 commit comments

Comments
 (0)