Skip to content

Commit

Permalink
Merge pull request #563 from zimnx/mz/prepare-1.2
Browse files Browse the repository at this point in the history
[v1.2] Use 1.2 version in manifests and charts as default image version
  • Loading branch information
tnozicka authored Apr 30, 2021
2 parents f8c97db + 75dcffd commit 1be6c6a
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ all: build

SHELL :=/bin/bash -euEo pipefail

IMAGE_TAG ?= latest
IMAGE_TAG ?= 1.2
IMAGE_REF ?= docker.io/scylladb/scylla-operator:$(IMAGE_TAG)

CODEGEN_PKG ?=./vendor/k8s.io/code-generator
Expand Down
2 changes: 1 addition & 1 deletion deploy/manager/dev/50_controller_deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.2
imagePullPolicy: IfNotPresent
env:
- name: POD_NAME
Expand Down
2 changes: 1 addition & 1 deletion deploy/manager/prod/50_controller_deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.2
imagePullPolicy: IfNotPresent
env:
- name: POD_NAME
Expand Down
2 changes: 1 addition & 1 deletion deploy/operator/50_deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
serviceAccountName: scylla-operator
containers:
- name: scylla-operator
image: docker.io/scylladb/scylla-operator:latest
image: docker.io/scylladb/scylla-operator:1.2
imagePullPolicy: IfNotPresent
env:
- name: POD_NAME
Expand Down
2 changes: 1 addition & 1 deletion examples/common/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,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.2
imagePullPolicy: IfNotPresent
env:
- name: POD_NAME
Expand Down
2 changes: 1 addition & 1 deletion examples/common/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2164,7 +2164,7 @@ spec:
serviceAccountName: scylla-operator
containers:
- name: scylla-operator
image: docker.io/scylladb/scylla-operator:latest
image: docker.io/scylladb/scylla-operator:1.2
imagePullPolicy: IfNotPresent
env:
- name: POD_NAME
Expand Down
2 changes: 1 addition & 1 deletion helm/scylla-manager/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.2" # overwritten during publishing
dependencies:
- name: scylla
version: 1.0.0
Expand Down
2 changes: 1 addition & 1 deletion helm/scylla-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.2" # overwritten during publishing
keywords:
- scylla
- scylladb
Expand Down

0 comments on commit 1be6c6a

Please sign in to comment.