Revert "deploy: Template changes for release v2.1.2"

This reverts commit a03675e3ae.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna 2020-06-05 13:57:38 +05:30 committed by Madhu Rajanna
parent a03675e3ae
commit fbc7d09670
11 changed files with 17 additions and 17 deletions

View File

@ -17,7 +17,7 @@
CONTAINER_CMD?=docker
CSI_IMAGE_NAME=$(if $(ENV_CSI_IMAGE_NAME),$(ENV_CSI_IMAGE_NAME),quay.io/cephcsi/cephcsi)
CSI_IMAGE_VERSION=$(if $(ENV_CSI_IMAGE_VERSION),$(ENV_CSI_IMAGE_VERSION),v2.1.2)
CSI_IMAGE_VERSION=$(if $(ENV_CSI_IMAGE_VERSION),$(ENV_CSI_IMAGE_VERSION),v2.1-canary)
CSI_IMAGE=$(CSI_IMAGE_NAME):$(CSI_IMAGE_VERSION)
$(info cephcsi image settings: $(CSI_IMAGE_NAME) version $(CSI_IMAGE_VERSION))

View File

@ -1,10 +1,10 @@
---
apiVersion: v1
appVersion: v2.1.2
appVersion: v2.1-canary
description: "Container Storage Interface (CSI) driver,
provisioner, and attacher for Ceph cephfs"
name: ceph-csi-cephfs
version: 2.1.2-canary
version: 2.1-canary
keywords:
- ceph
- cephfs

View File

@ -73,7 +73,7 @@ nodeplugin:
plugin:
image:
repository: quay.io/cephcsi/cephcsi
tag: v2.1.2
tag: v2.1-canary
pullPolicy: IfNotPresent
resources: {}

View File

@ -1,10 +1,10 @@
---
apiVersion: v1
appVersion: v2.1.2
appVersion: v2.1-canary
description: "Container Storage Interface (CSI) driver,
provisioner, snapshotter, and attacher for Ceph RBD"
name: ceph-csi-rbd
version: 2.1.2-canary
version: 2.1-canary
keywords:
- ceph
- rbd

View File

@ -87,7 +87,7 @@ nodeplugin:
plugin:
image:
repository: quay.io/cephcsi/cephcsi
tag: v2.1.2
tag: v2.1-canary
pullPolicy: IfNotPresent
resources: {}

View File

@ -79,7 +79,7 @@ build_push_images() {
}
if [ "${TRAVIS_BRANCH}" == 'release-v2.1' ]; then
export ENV_CSI_IMAGE_VERSION='v2.1.2'
export ENV_CSI_IMAGE_VERSION='v2.1-canary'
else
echo "!!! Branch ${TRAVIS_BRANCH} is not a deployable branch; exiting"
exit 0 # Exiting 0 so that this isn't marked as failing

View File

@ -81,7 +81,7 @@ spec:
capabilities:
add: ["SYS_ADMIN"]
# for stable functionality replace canary with latest release version
image: quay.io/cephcsi/cephcsi:v2.1.2
image: quay.io/cephcsi/cephcsi:v2.1-canary
args:
- "--nodeid=$(NODE_ID)"
- "--type=cephfs"
@ -122,7 +122,7 @@ spec:
- name: keys-tmp-dir
mountPath: /tmp/csi/keys
- name: liveness-prometheus
image: quay.io/cephcsi/cephcsi:v2.1.2
image: quay.io/cephcsi/cephcsi:v2.1-canary
args:
- "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)"

View File

@ -54,7 +54,7 @@ spec:
add: ["SYS_ADMIN"]
allowPrivilegeEscalation: true
# for stable functionality replace canary with latest release version
image: quay.io/cephcsi/cephcsi:v2.1.2
image: quay.io/cephcsi/cephcsi:v2.1-canary
args:
- "--nodeid=$(NODE_ID)"
- "--type=cephfs"
@ -109,7 +109,7 @@ spec:
- name: liveness-prometheus
securityContext:
privileged: true
image: quay.io/cephcsi/cephcsi:v2.1.2
image: quay.io/cephcsi/cephcsi:v2.1-canary
args:
- "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)"

View File

@ -101,7 +101,7 @@ spec:
capabilities:
add: ["SYS_ADMIN"]
# for stable functionality replace canary with latest release version
image: quay.io/cephcsi/cephcsi:v2.1.2
image: quay.io/cephcsi/cephcsi:v2.1-canary
args:
- "--nodeid=$(NODE_ID)"
- "--type=rbd"
@ -139,7 +139,7 @@ spec:
- name: keys-tmp-dir
mountPath: /tmp/csi/keys
- name: liveness-prometheus
image: quay.io/cephcsi/cephcsi:v2.1.2
image: quay.io/cephcsi/cephcsi:v2.1-canary
args:
- "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)"

View File

@ -55,7 +55,7 @@ spec:
add: ["SYS_ADMIN"]
allowPrivilegeEscalation: true
# for stable functionality replace canary with latest release version
image: quay.io/cephcsi/cephcsi:v2.1.2
image: quay.io/cephcsi/cephcsi:v2.1-canary
args:
- "--nodeid=$(NODE_ID)"
- "--type=rbd"
@ -111,7 +111,7 @@ spec:
- name: liveness-prometheus
securityContext:
privileged: true
image: quay.io/cephcsi/cephcsi:v2.1.2
image: quay.io/cephcsi/cephcsi:v2.1-canary
args:
- "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)"

View File

@ -142,7 +142,7 @@ teardown-rook)
;;
cephcsi)
echo "copying the cephcsi image"
copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:v2.1.2 "${CEPHCSI_IMAGE_REPO}"/cephcsi:v2.1.2
copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:v2.1-canary "${CEPHCSI_IMAGE_REPO}"/cephcsi:v2.1-canary
;;
k8s-sidecar)
echo "copying the kubernetes sidecar images"