From 5e5b396db294f3763b7100dcb662f7a48302d390 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Thu, 5 Sep 2019 12:31:29 +0530 Subject: [PATCH 1/3] update image versions from canary to v1.2.0 Signed-off-by: Madhu Rajanna --- .../cephfs/kubernetes/v1.13/csi-cephfsplugin-provisioner.yaml | 4 ++-- deploy/cephfs/kubernetes/v1.13/csi-cephfsplugin.yaml | 4 ++-- .../kubernetes/v1.14+/csi-cephfsplugin-provisioner.yaml | 4 ++-- deploy/cephfs/kubernetes/v1.14+/csi-cephfsplugin.yaml | 4 ++-- deploy/rbd/kubernetes/v1.13/csi-rbdplugin-provisioner.yaml | 4 ++-- deploy/rbd/kubernetes/v1.13/csi-rbdplugin.yaml | 4 ++-- deploy/rbd/kubernetes/v1.14+/csi-rbdplugin-provisioner.yaml | 4 ++-- deploy/rbd/kubernetes/v1.14+/csi-rbdplugin.yaml | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/deploy/cephfs/kubernetes/v1.13/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/v1.13/csi-cephfsplugin-provisioner.yaml index f52bddf0f..4cbe8e333 100644 --- a/deploy/cephfs/kubernetes/v1.13/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/v1.13/csi-cephfsplugin-provisioner.yaml @@ -68,7 +68,7 @@ spec: capabilities: add: ["SYS_ADMIN"] # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v1.2.0 args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -112,7 +112,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v1.2.0 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/cephfs/kubernetes/v1.13/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/v1.13/csi-cephfsplugin.yaml index c20c649ba..85ebad13f 100644 --- a/deploy/cephfs/kubernetes/v1.13/csi-cephfsplugin.yaml +++ b/deploy/cephfs/kubernetes/v1.13/csi-cephfsplugin.yaml @@ -49,7 +49,7 @@ spec: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v1.2.0 args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -102,7 +102,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v1.2.0 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/cephfs/kubernetes/v1.14+/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/v1.14+/csi-cephfsplugin-provisioner.yaml index 270077940..06ecc33f2 100644 --- a/deploy/cephfs/kubernetes/v1.14+/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/v1.14+/csi-cephfsplugin-provisioner.yaml @@ -71,7 +71,7 @@ spec: capabilities: add: ["SYS_ADMIN"] # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v1.2.0 args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -115,7 +115,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v1.2.0 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/cephfs/kubernetes/v1.14+/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/v1.14+/csi-cephfsplugin.yaml index fa022ef90..527e9c7ff 100644 --- a/deploy/cephfs/kubernetes/v1.14+/csi-cephfsplugin.yaml +++ b/deploy/cephfs/kubernetes/v1.14+/csi-cephfsplugin.yaml @@ -49,7 +49,7 @@ spec: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v1.2.0 args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -101,7 +101,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v1.2.0 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/rbd/kubernetes/v1.13/csi-rbdplugin-provisioner.yaml b/deploy/rbd/kubernetes/v1.13/csi-rbdplugin-provisioner.yaml index ff0908fc2..e7682af52 100644 --- a/deploy/rbd/kubernetes/v1.13/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/v1.13/csi-rbdplugin-provisioner.yaml @@ -83,7 +83,7 @@ spec: capabilities: add: ["SYS_ADMIN"] # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v1.2.0 args: - "--nodeid=$(NODE_ID)" - "--type=rbd" @@ -125,7 +125,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v1.2.0 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/rbd/kubernetes/v1.13/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/v1.13/csi-rbdplugin.yaml index 2897bdae7..0b8b4cdae 100644 --- a/deploy/rbd/kubernetes/v1.13/csi-rbdplugin.yaml +++ b/deploy/rbd/kubernetes/v1.13/csi-rbdplugin.yaml @@ -52,7 +52,7 @@ spec: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v1.2.0 args: - "--nodeid=$(NODE_ID)" - "--type=rbd" @@ -99,7 +99,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v1.2.0 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/rbd/kubernetes/v1.14+/csi-rbdplugin-provisioner.yaml b/deploy/rbd/kubernetes/v1.14+/csi-rbdplugin-provisioner.yaml index 70c2494b3..92269fb56 100644 --- a/deploy/rbd/kubernetes/v1.14+/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/v1.14+/csi-rbdplugin-provisioner.yaml @@ -86,7 +86,7 @@ spec: capabilities: add: ["SYS_ADMIN"] # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v1.2.0 args: - "--nodeid=$(NODE_ID)" - "--type=rbd" @@ -128,7 +128,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v1.2.0 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/rbd/kubernetes/v1.14+/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/v1.14+/csi-rbdplugin.yaml index 2897bdae7..0b8b4cdae 100644 --- a/deploy/rbd/kubernetes/v1.14+/csi-rbdplugin.yaml +++ b/deploy/rbd/kubernetes/v1.14+/csi-rbdplugin.yaml @@ -52,7 +52,7 @@ spec: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v1.2.0 args: - "--nodeid=$(NODE_ID)" - "--type=rbd" @@ -99,7 +99,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v1.2.0 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" From 9168a5ee09d9e76dc68f44484bf3fddbeaed3df3 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Thu, 5 Sep 2019 12:37:48 +0530 Subject: [PATCH 2/3] update canary to v1.2.0 to push cephcsi image Signed-off-by: Madhu Rajanna --- .travis.yml | 2 +- Makefile | 2 +- README.md | 5 +++-- deploy.sh | 7 ++----- scripts/minikube.sh | 2 +- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index a7d11e41a..9755cfdb1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ services: language: go branches: only: - - csi-v0.3 + - release-v1.2.0 - master go: 1.12.x diff --git a/Makefile b/Makefile index c8d6e2083..049b4fdfb 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),canary) +CSI_IMAGE_VERSION=$(if $(ENV_CSI_IMAGE_VERSION),$(ENV_CSI_IMAGE_VERSION),v1.2.0) $(info cephcsi image settings: $(CSI_IMAGE_NAME) version $(CSI_IMAGE_VERSION)) diff --git a/README.md b/README.md index bcb6dbcf3..d9a94cfdc 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ NOTE: ### Ceph-CSI features and available versions | Plugin | Features | Feature Status | CSI Driver Version | CSI Spec Version | Ceph Cluster Version | Kubernetes Version | -|--------|-----------------------------------------------------------|----------------|--------------------|------------------|----------------------|--------------------| +| ------ | --------------------------------------------------------- | -------------- | ------------------ | ---------------- | -------------------- | ------------------ | | RBD | Dynamically provision, de-provision Block mode RWO volume | GA | >=v1.0.0 | >=v1.0.0 | >= Mimic | >= v1.13.0 | | | Dynamically provision, de-provision Block mode RWX volume | GA | >=v1.0.0 | >=v1.0.0 | >= Mimic | >= v1.13.0 | | | Dynamically provision, de-provision File mode RWO volume | GA | >=v1.0.0 | >=v1.0.0 | >= Mimic | >= v1.13.0 | @@ -85,8 +85,9 @@ in the Kubernetes documentation. ## Ceph CSI Container images and release compatibility | Ceph CSI Release/Branch | Container image name | Image Tag | -|-------------------------|------------------------------|-----------| +| ----------------------- | ---------------------------- | --------- | | Master (Branch) | quay.io/cephcsi/cephcsi | canary | +| v1.2.0 (Branch) | quay.io/cephcsi/cephcsi | v1.2.0 | | v1.1.0 (Release) | quay.io/cephcsi/cephcsi | v1.1.0 | | v1.0.0 (Branch) | quay.io/cephcsi/cephfsplugin | v1.0.0 | | v1.0.0 (Branch) | quay.io/cephcsi/rbdplugin | v1.0.0 | diff --git a/deploy.sh b/deploy.sh index c483115bd..f5436b44f 100755 --- a/deploy.sh +++ b/deploy.sh @@ -24,11 +24,8 @@ push_helm_charts() { fi } -if [ "${TRAVIS_BRANCH}" == 'csi-v0.3' ]; then - export ENV_RBD_IMAGE_VERSION='v0.3-canary' - export ENV_CEPHFS_IMAGE_VERSION='v0.3-canary' -elif [ "${TRAVIS_BRANCH}" == 'master' ]; then - export ENV_CSI_IMAGE_VERSION='canary' +if [ "${TRAVIS_BRANCH}" == 'release-v1.2.0' ]; then + export ENV_CSI_IMAGE_VERSION='v1.2.0' 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/scripts/minikube.sh b/scripts/minikube.sh index 697e8fb31..d2b03148a 100755 --- a/scripts/minikube.sh +++ b/scripts/minikube.sh @@ -101,7 +101,7 @@ ssh) ;; cephcsi) echo "copying the cephcsi image" - copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:canary "${CEPHCSI_IMAGE_REPO}"/cephcsi:canary + copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:v1.2.0 "${CEPHCSI_IMAGE_REPO}"/cephcsi:v1.2.0 ;; k8s-sidecar) echo "copying the kubernetes sidecar images" From 51e446987817672502fbb137da30cacc05c3752c Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Thu, 5 Sep 2019 17:15:47 +0530 Subject: [PATCH 3/3] update canary to v1.2.0 in helm chat Signed-off-by: Madhu Rajanna --- deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/values.yaml | 2 +- .../cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/values.yaml | 2 +- deploy/rbd/ceph-csi-rbd | 1 + deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/values.yaml | 2 +- deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/values.yaml | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) create mode 120000 deploy/rbd/ceph-csi-rbd diff --git a/deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/values.yaml b/deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/values.yaml index 6538a4336..aff07cc73 100644 --- a/deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/values.yaml +++ b/deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/values.yaml @@ -34,7 +34,7 @@ nodeplugin: image: repository: quay.io/cephcsi/cephcsi # for stable functionality replace canary with latest release version - tag: canary + tag: v1.2.0 pullPolicy: IfNotPresent resources: {} diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/values.yaml b/deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/values.yaml index 0224284a4..2866a1d77 100644 --- a/deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/values.yaml +++ b/deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/values.yaml @@ -34,7 +34,7 @@ nodeplugin: image: repository: quay.io/cephcsi/cephcsi # for stable functionality replace canary with latest release version - tag: canary + tag: v1.2.0 pullPolicy: IfNotPresent resources: {} diff --git a/deploy/rbd/ceph-csi-rbd b/deploy/rbd/ceph-csi-rbd new file mode 120000 index 000000000..5a8e18c53 --- /dev/null +++ b/deploy/rbd/ceph-csi-rbd @@ -0,0 +1 @@ +helm \ No newline at end of file diff --git a/deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/values.yaml b/deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/values.yaml index 6ef6a9b1c..be02dfa9e 100644 --- a/deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/values.yaml +++ b/deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/values.yaml @@ -34,7 +34,7 @@ nodeplugin: image: repository: quay.io/cephcsi/cephcsi # for stable functionality replace canary with latest release version - tag: canary + tag: v1.2.0 pullPolicy: IfNotPresent resources: {} diff --git a/deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/values.yaml b/deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/values.yaml index a0fd973ef..00d0e9b6a 100644 --- a/deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/values.yaml +++ b/deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/values.yaml @@ -34,7 +34,7 @@ nodeplugin: image: repository: quay.io/cephcsi/cephcsi # for stable functionality replace canary with latest release version - tag: canary + tag: v1.2.0 pullPolicy: IfNotPresent resources: {}