From a03675e3aeea093a48c389c5795730445356f3e1 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Fri, 5 Jun 2020 12:27:47 +0530 Subject: [PATCH] deploy: Template changes for release v2.1.2 Updated the templates and the required scripts to make a v2.1.2 release. 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 99d9a9dc6..872e815b1 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.1-canary) +CSI_IMAGE_VERSION=$(if $(ENV_CSI_IMAGE_VERSION),$(ENV_CSI_IMAGE_VERSION),v2.1.2) 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 375337867..6f1d30b02 100644 --- a/charts/ceph-csi-cephfs/Chart.yaml +++ b/charts/ceph-csi-cephfs/Chart.yaml @@ -1,10 +1,10 @@ --- apiVersion: v1 -appVersion: v2.1-canary +appVersion: v2.1.2 description: "Container Storage Interface (CSI) driver, provisioner, and attacher for Ceph cephfs" name: ceph-csi-cephfs -version: 2.1-canary +version: 2.1.2-canary keywords: - ceph - cephfs diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml index 82070be83..578ff3c57 100644 --- a/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml @@ -73,7 +73,7 @@ nodeplugin: plugin: image: repository: quay.io/cephcsi/cephcsi - tag: v2.1-canary + tag: v2.1.2 pullPolicy: IfNotPresent resources: {} diff --git a/charts/ceph-csi-rbd/Chart.yaml b/charts/ceph-csi-rbd/Chart.yaml index efe8babd5..8980482b9 100644 --- a/charts/ceph-csi-rbd/Chart.yaml +++ b/charts/ceph-csi-rbd/Chart.yaml @@ -1,10 +1,10 @@ --- apiVersion: v1 -appVersion: v2.1-canary +appVersion: v2.1.2 description: "Container Storage Interface (CSI) driver, provisioner, snapshotter, and attacher for Ceph RBD" name: ceph-csi-rbd -version: 2.1-canary +version: 2.1.2-canary keywords: - ceph - rbd diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index 2e51f04b7..8236688f0 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml @@ -87,7 +87,7 @@ nodeplugin: plugin: image: repository: quay.io/cephcsi/cephcsi - tag: v2.1-canary + tag: v2.1.2 pullPolicy: IfNotPresent resources: {} diff --git a/deploy.sh b/deploy.sh index 2c672c313..aff7cacb0 100755 --- a/deploy.sh +++ b/deploy.sh @@ -79,7 +79,7 @@ build_push_images() { } if [ "${TRAVIS_BRANCH}" == 'release-v2.1' ]; then - export ENV_CSI_IMAGE_VERSION='v2.1-canary' + export ENV_CSI_IMAGE_VERSION='v2.1.2' 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 2bd183877..d0529b1a9 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml @@ -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-canary + image: quay.io/cephcsi/cephcsi:v2.1.2 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-canary + image: quay.io/cephcsi/cephcsi:v2.1.2 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml index c39a89d67..e2aa56bc5 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.1-canary + image: quay.io/cephcsi/cephcsi:v2.1.2 args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -109,7 +109,7 @@ spec: - name: liveness-prometheus securityContext: privileged: true - image: quay.io/cephcsi/cephcsi:v2.1-canary + image: quay.io/cephcsi/cephcsi:v2.1.2 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 e939f2925..7da018034 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml @@ -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-canary + image: quay.io/cephcsi/cephcsi:v2.1.2 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-canary + image: quay.io/cephcsi/cephcsi:v2.1.2 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml index 0e5e502ca..24161ef53 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.1-canary + image: quay.io/cephcsi/cephcsi:v2.1.2 args: - "--nodeid=$(NODE_ID)" - "--type=rbd" @@ -111,7 +111,7 @@ spec: - name: liveness-prometheus securityContext: privileged: true - image: quay.io/cephcsi/cephcsi:v2.1-canary + image: quay.io/cephcsi/cephcsi:v2.1.2 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/scripts/minikube.sh b/scripts/minikube.sh index 572dc445a..42e23194d 100755 --- a/scripts/minikube.sh +++ b/scripts/minikube.sh @@ -142,7 +142,7 @@ teardown-rook) ;; cephcsi) echo "copying the cephcsi image" - copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:v2.1-canary "${CEPHCSI_IMAGE_REPO}"/cephcsi:v2.1-canary + copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:v2.1.2 "${CEPHCSI_IMAGE_REPO}"/cephcsi:v2.1.2 ;; k8s-sidecar) echo "copying the kubernetes sidecar images"