Skip to content

Commit

Permalink
Merge pull request #1133 from zimnx/mz/prepare-1.8
Browse files Browse the repository at this point in the history
[v1.8] Prepare 1.8 release branch
  • Loading branch information
zimnx authored Jan 2, 2023
2 parents 531f738 + 86e1287 commit 32e5510
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SHELL :=/bin/bash -euEo pipefail -O inherit_errexit

comma :=,

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

MAKE_REQUIRED_MIN_VERSION:=4.2 # for SHELLSTATUS
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.8
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.8
imagePullPolicy: IfNotPresent
env:
- name: POD_NAME
Expand Down
4 changes: 2 additions & 2 deletions deploy/operator/50_operator.deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.8
imagePullPolicy: IfNotPresent
env:
- name: SCYLLA_OPERATOR_IMAGE
value: docker.io/scylladb/scylla-operator:latest
value: docker.io/scylladb/scylla-operator:1.8
args:
- operator
- --loglevel=2
Expand Down
2 changes: 1 addition & 1 deletion deploy/operator/50_webhookserver.deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.8
imagePullPolicy: IfNotPresent
args:
- run-webhook-server
Expand Down
2 changes: 1 addition & 1 deletion examples/common/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.8
imagePullPolicy: IfNotPresent
env:
- name: POD_NAME
Expand Down
6 changes: 3 additions & 3 deletions examples/common/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2640,11 +2640,11 @@ spec:
serviceAccountName: scylla-operator
containers:
- name: scylla-operator
image: docker.io/scylladb/scylla-operator:latest
image: docker.io/scylladb/scylla-operator:1.8
imagePullPolicy: IfNotPresent
env:
- name: SCYLLA_OPERATOR_IMAGE
value: docker.io/scylladb/scylla-operator:latest
value: docker.io/scylladb/scylla-operator:1.8
args:
- operator
- --loglevel=2
Expand Down Expand Up @@ -2690,7 +2690,7 @@ spec:
serviceAccountName: "webhook-server"
containers:
- name: webhook-server
image: docker.io/scylladb/scylla-operator:latest
image: docker.io/scylladb/scylla-operator:1.8
imagePullPolicy: IfNotPresent
args:
- run-webhook-server
Expand Down
2 changes: 1 addition & 1 deletion examples/gke/xfs-formatter-daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
effect: NoSchedule
containers:
- name: xfs-formatter
image: docker.io/scylladb/scylla-operator:latest
image: docker.io/scylladb/scylla-operator:1.8
securityContext:
privileged: true
command:
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.8" # 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.8" # overwritten during publishing
keywords:
- scylla
- scylladb
Expand Down

0 comments on commit 32e5510

Please sign in to comment.