From 22b631e991c5309e117f1b99f49d1163aa5c8744 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Mon, 28 Sep 2020 13:50:38 +0530 Subject: [PATCH] build: update templates for v3.1.1 release updated required templates for v3.1.1 release. Signed-off-by: Madhu Rajanna --- Makefile | 2 +- build.env | 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 ++-- docs/ceph-csi-upgrade.md | 4 ++-- scripts/minikube.sh | 2 +- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index 377117fb0ee..4ac5be50503 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ CPUS?=$(shell nproc --ignore=1) CPUSET?=--cpuset-cpus=0-${CPUS} 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),v3.1-canary) +CSI_IMAGE_VERSION=$(if $(ENV_CSI_IMAGE_VERSION),$(ENV_CSI_IMAGE_VERSION),v3.1.1) CSI_IMAGE=$(CSI_IMAGE_NAME):$(CSI_IMAGE_VERSION) $(info cephcsi image settings: $(CSI_IMAGE_NAME) version $(CSI_IMAGE_VERSION)) diff --git a/build.env b/build.env index 304ec0de088..a01fc8ebddf 100644 --- a/build.env +++ b/build.env @@ -43,4 +43,4 @@ DEPLOY_TIMEOUT=10 UPGRADE_VERSION=v3.0.0 # This var will be used by CentOS CI to build the image -CSI_IMAGE_VERSION=v3.1-canary +CSI_IMAGE_VERSION=v3.1.1 diff --git a/charts/ceph-csi-cephfs/Chart.yaml b/charts/ceph-csi-cephfs/Chart.yaml index e66fab2a17a..811a4238f85 100644 --- a/charts/ceph-csi-cephfs/Chart.yaml +++ b/charts/ceph-csi-cephfs/Chart.yaml @@ -1,10 +1,10 @@ --- apiVersion: v1 -appVersion: v3.1-canary +appVersion: v3.1.1 description: "Container Storage Interface (CSI) driver, provisioner, snapshotter and attacher for Ceph cephfs" name: ceph-csi-cephfs -version: 3.1-canary +version: 3.1.1-canary keywords: - ceph - cephfs diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml index 345da34fb63..269ca677c07 100644 --- a/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml @@ -75,7 +75,7 @@ nodeplugin: plugin: image: repository: quay.io/cephcsi/cephcsi - tag: v3.1-canary + tag: v3.1.1 pullPolicy: IfNotPresent resources: {} diff --git a/charts/ceph-csi-rbd/Chart.yaml b/charts/ceph-csi-rbd/Chart.yaml index 8135c5ee239..ee878a980db 100644 --- a/charts/ceph-csi-rbd/Chart.yaml +++ b/charts/ceph-csi-rbd/Chart.yaml @@ -1,10 +1,10 @@ --- apiVersion: v1 -appVersion: v3.1-canary +appVersion: v3.1.1 description: "Container Storage Interface (CSI) driver, provisioner, snapshotter, and attacher for Ceph RBD" name: ceph-csi-rbd -version: 3.1-canary +version: 3.1.1-canary keywords: - ceph - rbd diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index 8020777530b..e022e78b5bb 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: v3.1-canary + tag: v3.1.1 pullPolicy: IfNotPresent resources: {} diff --git a/deploy.sh b/deploy.sh index 3319ebbb1c9..06bfbed162c 100755 --- a/deploy.sh +++ b/deploy.sh @@ -83,7 +83,7 @@ build_push_images() { } if [ "${TRAVIS_BRANCH}" == 'release-v3.1' ]; then - export ENV_CSI_IMAGE_VERSION='v3.1-canary' + export ENV_CSI_IMAGE_VERSION='v3.1.1' 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 e3fb6bdcda5..4405b196e24 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml @@ -99,7 +99,7 @@ spec: capabilities: add: ["SYS_ADMIN"] # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v3.1-canary + image: quay.io/cephcsi/cephcsi:v3.1.1 args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -135,7 +135,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:v3.1-canary + image: quay.io/cephcsi/cephcsi:v3.1.1 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml index b98823ea302..c0a76691525 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:v3.1-canary + image: quay.io/cephcsi/cephcsi:v3.1.1 args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -104,7 +104,7 @@ spec: - name: liveness-prometheus securityContext: privileged: true - image: quay.io/cephcsi/cephcsi:v3.1-canary + image: quay.io/cephcsi/cephcsi:v3.1.1 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 f0ea22968e6..1f8f5157b1a 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml @@ -99,7 +99,7 @@ spec: capabilities: add: ["SYS_ADMIN"] # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v3.1-canary + image: quay.io/cephcsi/cephcsi:v3.1.1 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:v3.1-canary + image: quay.io/cephcsi/cephcsi:v3.1.1 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml index cd1bc50dc95..334d941aa66 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:v3.1-canary + image: quay.io/cephcsi/cephcsi:v3.1.1 args: - "--nodeid=$(NODE_ID)" - "--type=rbd" @@ -107,7 +107,7 @@ spec: - name: liveness-prometheus securityContext: privileged: true - image: quay.io/cephcsi/cephcsi:v3.1-canary + image: quay.io/cephcsi/cephcsi:v3.1.1 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/docs/ceph-csi-upgrade.md b/docs/ceph-csi-upgrade.md index efadd3efc3a..a0990c51432 100644 --- a/docs/ceph-csi-upgrade.md +++ b/docs/ceph-csi-upgrade.md @@ -84,12 +84,12 @@ that will not be supported in the official releases. Builds from the master branch can have functionality changed and even removed at any time without compatibility support and without prior notice. -git checkout v3.1.0 tag +git checkout v3.1.1 tag ```bash [$] git clone https://github.com/ceph/ceph-csi.git [$] cd ./ceph-csi -[$] git checkout v3.1.0 +[$] git checkout v3.1.1 ``` **Note:** While upgrading please Ignore warning messages from kubectl output diff --git a/scripts/minikube.sh b/scripts/minikube.sh index ca743a3cef8..a2cf865d924 100755 --- a/scripts/minikube.sh +++ b/scripts/minikube.sh @@ -239,7 +239,7 @@ teardown-rook) ;; cephcsi) echo "copying the cephcsi image" - copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:v3.1-canary "${CEPHCSI_IMAGE_REPO}"/cephcsi:v3.1-canary + copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:v3.1.1 "${CEPHCSI_IMAGE_REPO}"/cephcsi:v3.1.1 ;; k8s-sidecar) echo "copying the kubernetes sidecar images"