From ba172829063195ae2129559d509742505b82a8f1 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Mon, 3 May 2021 17:04:03 +0530 Subject: [PATCH] revert: template changes for release v3.2.2 This reverts commit d719986cacc5945c409fa70e42601d1fed89b2e6 which was created to make template changes for v3.2.2 release. Signed-off-by: Madhu Rajanna --- 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/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml | 4 ++-- deploy/cephfs/kubernetes/csi-cephfsplugin.yaml | 4 ++-- deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml | 6 +++--- deploy/rbd/kubernetes/csi-rbdplugin.yaml | 4 ++-- scripts/minikube.sh | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build.env b/build.env index 08b2af2b1..e91cd8fa5 100644 --- a/build.env +++ b/build.env @@ -10,7 +10,7 @@ # # cephcsi image version -CSI_IMAGE_VERSION=v3.2.2 +CSI_IMAGE_VERSION=v3.2-canary # Ceph version to use BASE_IMAGE=docker.io/ceph/ceph:v15 diff --git a/charts/ceph-csi-cephfs/Chart.yaml b/charts/ceph-csi-cephfs/Chart.yaml index 84c3a36f8..f4e0368a8 100644 --- a/charts/ceph-csi-cephfs/Chart.yaml +++ b/charts/ceph-csi-cephfs/Chart.yaml @@ -1,10 +1,10 @@ --- apiVersion: v1 -appVersion: v3.2.2 +appVersion: v3.2-canary description: "Container Storage Interface (CSI) driver, provisioner, snapshotter and attacher for Ceph cephfs" name: ceph-csi-cephfs -version: 3.2.2-canary +version: 3.2-canary keywords: - ceph - cephfs diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml index 2cfc730b0..4e8f773b4 100644 --- a/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml @@ -80,7 +80,7 @@ nodeplugin: plugin: image: repository: quay.io/cephcsi/cephcsi - tag: v3.2.2 + tag: v3.2-canary pullPolicy: IfNotPresent resources: {} diff --git a/charts/ceph-csi-rbd/Chart.yaml b/charts/ceph-csi-rbd/Chart.yaml index 7110aa8d3..3bb8f89ac 100644 --- a/charts/ceph-csi-rbd/Chart.yaml +++ b/charts/ceph-csi-rbd/Chart.yaml @@ -1,10 +1,10 @@ --- apiVersion: v1 -appVersion: v3.2.2 +appVersion: v3.2-canary description: "Container Storage Interface (CSI) driver, provisioner, snapshotter, and attacher for Ceph RBD" name: ceph-csi-rbd -version: 3.2.2-canary +version: 3.2-canary keywords: - ceph - rbd diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index 9da366bfa..033baf348 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml @@ -92,7 +92,7 @@ nodeplugin: plugin: image: repository: quay.io/cephcsi/cephcsi - tag: v3.2.2 + tag: v3.2-canary pullPolicy: IfNotPresent resources: {} diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml index 1c4a80cd2..60064f459 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml @@ -109,7 +109,7 @@ spec: capabilities: add: ["SYS_ADMIN"] # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v3.2.2 + image: quay.io/cephcsi/cephcsi:v3.2-canary args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -145,7 +145,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:v3.2.2 + image: quay.io/cephcsi/cephcsi:v3.2-canary args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml index 79a9bd57a..34cf0db24 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml @@ -46,7 +46,7 @@ spec: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v3.2.2 + image: quay.io/cephcsi/cephcsi:v3.2-canary args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -96,7 +96,7 @@ spec: - name: liveness-prometheus securityContext: privileged: true - image: quay.io/cephcsi/cephcsi:v3.2.2 + image: quay.io/cephcsi/cephcsi:v3.2-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 a825ad64e..d14a92ffa 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml @@ -112,7 +112,7 @@ spec: capabilities: add: ["SYS_ADMIN"] # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v3.2.2 + image: quay.io/cephcsi/cephcsi:v3.2-canary args: - "--nodeid=$(NODE_ID)" - "--type=rbd" @@ -157,7 +157,7 @@ spec: capabilities: add: ["SYS_ADMIN"] # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v3.2.2 + image: quay.io/cephcsi/cephcsi:v3.2-canary args: - "--type=controller" - "--v=5" @@ -175,7 +175,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:v3.2.2 + image: quay.io/cephcsi/cephcsi:v3.2-canary args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml index 1dc498e9b..7c98c0c0c 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin.yaml @@ -47,7 +47,7 @@ spec: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v3.2.2 + image: quay.io/cephcsi/cephcsi:v3.2-canary args: - "--nodeid=$(NODE_ID)" - "--type=rbd" @@ -99,7 +99,7 @@ spec: - name: liveness-prometheus securityContext: privileged: true - image: quay.io/cephcsi/cephcsi:v3.2.2 + image: quay.io/cephcsi/cephcsi:v3.2-canary args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/scripts/minikube.sh b/scripts/minikube.sh index 67a2a0e57..7395fc669 100755 --- a/scripts/minikube.sh +++ b/scripts/minikube.sh @@ -280,7 +280,7 @@ teardown-rook) ;; cephcsi) echo "copying the cephcsi image" - copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:v3.2.2 "${CEPHCSI_IMAGE_REPO}"/cephcsi:v3.2.2 + copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:v3.2-canary "${CEPHCSI_IMAGE_REPO}"/cephcsi:v3.2-canary ;; k8s-sidecar) echo "copying the kubernetes sidecar images"