From be6318716e08f6307206508d41a63eaa3781d408 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Wed, 18 Mar 2020 12:33:09 +0530 Subject: [PATCH] Prep for cephcsi v2.0.1 release Updated Files to push new v2.0.1 release and also updated the yaml files to refect the new image tag. fixes: #855 fixes: #829 Signed-off-by: Madhu Rajanna --- Makefile | 2 +- README.md | 1 + 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 +- .../kubernetes/csi-cephfsplugin-provisioner.yaml | 4 ++-- deploy/cephfs/kubernetes/csi-cephfsplugin.yaml | 4 ++-- .../rbd/kubernetes/csi-rbdplugin-provisioner.yaml | 4 ++-- deploy/rbd/kubernetes/csi-rbdplugin.yaml | 4 ++-- docs/ceph-csi-upgrade.md | 14 +++++++------- scripts/minikube.sh | 2 +- 13 files changed, 25 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index d29514e92..181cd680d 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-canary) +CSI_IMAGE_VERSION=$(if $(ENV_CSI_IMAGE_VERSION),$(ENV_CSI_IMAGE_VERSION),v2.0.1) CSI_IMAGE=$(CSI_IMAGE_NAME):$(CSI_IMAGE_VERSION) $(info cephcsi image settings: $(CSI_IMAGE_NAME) version $(CSI_IMAGE_VERSION)) diff --git a/README.md b/README.md index 91b510eb3..ef820a451 100644 --- a/README.md +++ b/README.md @@ -91,6 +91,7 @@ in the Kubernetes documentation. | Ceph CSI Release/Branch | Container image name | Image Tag | | ----------------------- | ---------------------------- | --------- | | Master (Branch) | quay.io/cephcsi/cephcsi | canary | +| v2.0.1 (Release) | quay.io/cephcsi/cephcsi | v2.0.1 | | v2.0.0 (Release) | quay.io/cephcsi/cephcsi | v2.0.0 | | v1.2.2 (Release) | quay.io/cephcsi/cephcsi | v1.2.2 | | v1.2.1 (Release) | quay.io/cephcsi/cephcsi | v1.2.1 | diff --git a/charts/ceph-csi-cephfs/Chart.yaml b/charts/ceph-csi-cephfs/Chart.yaml index 442dc1ee7..bc8dd3fc3 100644 --- a/charts/ceph-csi-cephfs/Chart.yaml +++ b/charts/ceph-csi-cephfs/Chart.yaml @@ -1,10 +1,10 @@ --- apiVersion: v1 -appVersion: v2.0-canary +appVersion: v2.0.1 description: "Container Storage Interface (CSI) driver, provisioner, and attacher for Ceph cephfs" name: ceph-csi-cephfs -version: 2.0-canary +version: 2.0.1-canary keywords: - ceph - cephfs diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml index c2bd7dcbc..1039f2708 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-canary + tag: v2.0.1 pullPolicy: IfNotPresent resources: {} diff --git a/charts/ceph-csi-rbd/Chart.yaml b/charts/ceph-csi-rbd/Chart.yaml index fc3fb19a1..a7602a2ee 100644 --- a/charts/ceph-csi-rbd/Chart.yaml +++ b/charts/ceph-csi-rbd/Chart.yaml @@ -1,10 +1,10 @@ --- apiVersion: v1 -appVersion: v2.0-canary +appVersion: v2.0.1 description: "Container Storage Interface (CSI) driver, provisioner, snapshotter, and attacher for Ceph RBD" name: ceph-csi-rbd -version: 2.0-canary +version: 2.0.1-canary keywords: - ceph - rbd diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index 46c215f84..f1f2d096d 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-canary + tag: v2.0.1 pullPolicy: IfNotPresent resources: {} diff --git a/deploy.sh b/deploy.sh index a9cda5a9f..5058db01b 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-canary' + export ENV_CSI_IMAGE_VERSION='v2.0.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 c6784c731..6042db6eb 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-canary + image: quay.io/cephcsi/cephcsi:v2.0.1 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-canary + image: quay.io/cephcsi/cephcsi:v2.0.1 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml index 015219425..0e2af999e 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-canary + image: quay.io/cephcsi/cephcsi:v2.0.1 args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -110,7 +110,7 @@ spec: - name: liveness-prometheus securityContext: privileged: true - image: quay.io/cephcsi/cephcsi:v2.0-canary + image: quay.io/cephcsi/cephcsi:v2.0.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 a92bb6714..b508e49ea 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-canary + image: quay.io/cephcsi/cephcsi:v2.0.1 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-canary + image: quay.io/cephcsi/cephcsi:v2.0.1 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml index f73daf40b..ef193c5da 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-canary + image: quay.io/cephcsi/cephcsi:v2.0.1 args: - "--nodeid=$(NODE_ID)" - "--type=rbd" @@ -107,7 +107,7 @@ spec: - name: liveness-prometheus securityContext: privileged: true - image: quay.io/cephcsi/cephcsi:v2.0-canary + image: quay.io/cephcsi/cephcsi:v2.0.1 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/docs/ceph-csi-upgrade.md b/docs/ceph-csi-upgrade.md index 62c5726c2..9751e466e 100644 --- a/docs/ceph-csi-upgrade.md +++ b/docs/ceph-csi-upgrade.md @@ -2,7 +2,7 @@ - [Ceph-csi Upgrade](#ceph-csi-upgrade) - [Pre-upgrade considerations](#pre-upgrade-considerations) - - [Upgrading from v1.2.x to v2.0.0](#upgrading-from-v12x-to-v200) + - [Upgrading from v1.2.x to v2.0.1](#upgrading-from-v12x-to-v201) - [Upgrading CephFS](#upgrading-cephfs) - [1. Upgrade CephFS Provisioner resources](#1-upgrade-cephfs-provisioner-resources) - [1.1 Update the CephFS Provisioner RBAC](#11-update-the-cephfs-provisioner-rbac) @@ -44,9 +44,9 @@ To avoid this issue in future upgrades, we recommend that you do not use the fuse client or rbd-nbd as of now. This guide will walk you through the steps to upgrade the software in a cluster -from v1.2.x to v2.0.0 +from v1.2.x to v2.0.1 -## Upgrading from v1.2.x to v2.0.0 +## Upgrading from v1.2.x to v2.0.1 **Ceph-csi releases from master are expressly unsupported.** It is strongly recommended that you use [official @@ -56,11 +56,11 @@ 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 release v2.0.0 branch +git checkout release v2.0.1 branch ```bash [$] git clone https://github.com/ceph/ceph-csi.git -[$] git check v2.0.0 +[$] git check v2.0.1 [$] cd ./ceph-csi ``` @@ -186,7 +186,7 @@ For each node: - The pod deletion causes the pods to be restarted and updated automatically on the node. -we have successfully upgraded cephfs csi from v1.2.2 to v2.0.0 +we have successfully upgraded cephfs csi from v1.2.x to v2.0.1 ### Upgrading RBD @@ -304,7 +304,7 @@ For each node: - The pod deletion causes the pods to be restarted and updated automatically on the node. -we have successfully upgraded RBD csi from v1.2.2 to v2.0.0 +we have successfully upgraded RBD csi from v1.2.x to v2.0.1 ### Handling node reboot hangs due to existing network mounts diff --git a/scripts/minikube.sh b/scripts/minikube.sh index 99a9ab173..a2056bb32 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-canary "${CEPHCSI_IMAGE_REPO}"/cephcsi:v2.0-canary + copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:v2.0.1 "${CEPHCSI_IMAGE_REPO}"/cephcsi:v2.0.1 ;; k8s-sidecar) echo "copying the kubernetes sidecar images"