From 79f1fa2b67f6c4044ef471e6a329a8fd94f04ef7 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Thu, 19 Mar 2020 22:55:08 +0530 Subject: [PATCH] Revert back the changes made for v2.0.1 release Reverting back the changes done for v2.0.1 as release is out and we dont want to update the released image again. Signed-off-by: Madhu Rajanna --- Makefile | 2 +- charts/ceph-csi-cephfs/Chart.yaml | 4 ++-- charts/ceph-csi-cephfs/values.yaml | 2 +- charts/ceph-csi-rbd/Chart.yaml | 4 ++-- charts/ceph-csi-rbd/values.yaml | 2 +- deploy.sh | 2 +- deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml | 4 ++-- deploy/cephfs/kubernetes/csi-cephfsplugin.yaml | 4 ++-- deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml | 4 ++-- deploy/rbd/kubernetes/csi-rbdplugin.yaml | 4 ++-- scripts/minikube.sh | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 181cd680d..d29514e92 100644 --- a/Makefile +++ b/Makefile @@ -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.0.1) +CSI_IMAGE_VERSION=$(if $(ENV_CSI_IMAGE_VERSION),$(ENV_CSI_IMAGE_VERSION),v2.0-canary) CSI_IMAGE=$(CSI_IMAGE_NAME):$(CSI_IMAGE_VERSION) $(info cephcsi image settings: $(CSI_IMAGE_NAME) version $(CSI_IMAGE_VERSION)) diff --git a/charts/ceph-csi-cephfs/Chart.yaml b/charts/ceph-csi-cephfs/Chart.yaml index bc8dd3fc3..442dc1ee7 100644 --- a/charts/ceph-csi-cephfs/Chart.yaml +++ b/charts/ceph-csi-cephfs/Chart.yaml @@ -1,10 +1,10 @@ --- apiVersion: v1 -appVersion: v2.0.1 +appVersion: v2.0-canary description: "Container Storage Interface (CSI) driver, provisioner, and attacher for Ceph cephfs" name: ceph-csi-cephfs -version: 2.0.1-canary +version: 2.0-canary keywords: - ceph - cephfs diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml index 1039f2708..c2bd7dcbc 100644 --- a/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml @@ -104,7 +104,7 @@ nodeplugin: plugin: image: repository: quay.io/cephcsi/cephcsi - tag: v2.0.1 + tag: v2.0-canary pullPolicy: IfNotPresent resources: {} diff --git a/charts/ceph-csi-rbd/Chart.yaml b/charts/ceph-csi-rbd/Chart.yaml index a7602a2ee..fc3fb19a1 100644 --- a/charts/ceph-csi-rbd/Chart.yaml +++ b/charts/ceph-csi-rbd/Chart.yaml @@ -1,10 +1,10 @@ --- apiVersion: v1 -appVersion: v2.0.1 +appVersion: v2.0-canary description: "Container Storage Interface (CSI) driver, provisioner, snapshotter, and attacher for Ceph RBD" name: ceph-csi-rbd -version: 2.0.1-canary +version: 2.0-canary keywords: - ceph - rbd diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index f1f2d096d..46c215f84 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml @@ -104,7 +104,7 @@ nodeplugin: plugin: image: repository: quay.io/cephcsi/cephcsi - tag: v2.0.1 + tag: v2.0-canary pullPolicy: IfNotPresent resources: {} diff --git a/deploy.sh b/deploy.sh index 5058db01b..a9cda5a9f 100755 --- a/deploy.sh +++ b/deploy.sh @@ -71,7 +71,7 @@ build_push_images() { } if [ "${TRAVIS_BRANCH}" == 'release-v2.0' ]; then - export ENV_CSI_IMAGE_VERSION='v2.0.1' + export ENV_CSI_IMAGE_VERSION='v2.0-canary' else echo "!!! Branch ${TRAVIS_BRANCH} is not a deployable branch; exiting" exit 0 # Exiting 0 so that this isn't marked as failing diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml index 6042db6eb..c6784c731 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml @@ -84,7 +84,7 @@ spec: capabilities: add: ["SYS_ADMIN"] # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v2.0.1 + image: quay.io/cephcsi/cephcsi:v2.0-canary args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -128,7 +128,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:v2.0.1 + image: quay.io/cephcsi/cephcsi:v2.0-canary args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml index 0e2af999e..015219425 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml @@ -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.0.1 + image: quay.io/cephcsi/cephcsi:v2.0-canary args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -110,7 +110,7 @@ spec: - name: liveness-prometheus securityContext: privileged: true - image: quay.io/cephcsi/cephcsi:v2.0.1 + image: quay.io/cephcsi/cephcsi:v2.0-canary args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml index b508e49ea..a92bb6714 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml @@ -104,7 +104,7 @@ spec: capabilities: add: ["SYS_ADMIN"] # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v2.0.1 + image: quay.io/cephcsi/cephcsi:v2.0-canary args: - "--nodeid=$(NODE_ID)" - "--type=rbd" @@ -143,7 +143,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:v2.0.1 + image: quay.io/cephcsi/cephcsi:v2.0-canary args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml index ef193c5da..f73daf40b 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin.yaml @@ -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.0.1 + image: quay.io/cephcsi/cephcsi:v2.0-canary args: - "--nodeid=$(NODE_ID)" - "--type=rbd" @@ -107,7 +107,7 @@ spec: - name: liveness-prometheus securityContext: privileged: true - image: quay.io/cephcsi/cephcsi:v2.0.1 + image: quay.io/cephcsi/cephcsi:v2.0-canary args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/scripts/minikube.sh b/scripts/minikube.sh index a2056bb32..99a9ab173 100755 --- a/scripts/minikube.sh +++ b/scripts/minikube.sh @@ -129,7 +129,7 @@ teardown-rook) ;; cephcsi) echo "copying the cephcsi image" - copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:v2.0.1 "${CEPHCSI_IMAGE_REPO}"/cephcsi:v2.0.1 + copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:v2.0-canary "${CEPHCSI_IMAGE_REPO}"/cephcsi:v2.0-canary ;; k8s-sidecar) echo "copying the kubernetes sidecar images"