From 77f5435c4c0f3dc86e1e634fc772d0fcaf0ba7c9 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Thu, 9 Jun 2022 14:43:53 +0530 Subject: [PATCH] revert: release 3.6.2 template changes This reverts commit 520903d07b5467e36f2b1ef03911a58f68902829. Signed-off-by: Madhu Rajanna --- build.env | 2 +- charts/ceph-csi-cephfs/values.yaml | 2 +- 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 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build.env b/build.env index edd76e3e4..a678d163b 100644 --- a/build.env +++ b/build.env @@ -9,7 +9,7 @@ # get proporly expanded. # # cephcsi image version -CSI_IMAGE_VERSION=v3.6.2 +CSI_IMAGE_VERSION=v3.6-canary # Ceph version to use BASE_IMAGE=quay.io/ceph/ceph:v17 diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml index 7375ea6b0..9822480b4 100644 --- a/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml @@ -88,7 +88,7 @@ nodeplugin: plugin: image: repository: quay.io/cephcsi/cephcsi - tag: v3.6.2 + tag: v3.6-canary pullPolicy: IfNotPresent resources: {} diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index 42a06c448..490828942 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml @@ -111,7 +111,7 @@ nodeplugin: plugin: image: repository: quay.io/cephcsi/cephcsi - tag: v3.6.2 + tag: v3.6-canary pullPolicy: IfNotPresent resources: {} diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml index be28418d1..77b173ad0 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml @@ -105,7 +105,7 @@ spec: mountPath: /csi - name: csi-cephfsplugin # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v3.6.2 + image: quay.io/cephcsi/cephcsi:v3.6-canary args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -144,7 +144,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:v3.6.2 + image: quay.io/cephcsi/cephcsi:v3.6-canary args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml index f13f1400d..96d943a3e 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml +++ b/deploy/cephfs/kubernetes/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:v3.6.2 + image: quay.io/cephcsi/cephcsi:v3.6-canary args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -108,7 +108,7 @@ spec: securityContext: privileged: true allowPrivilegeEscalation: true - image: quay.io/cephcsi/cephcsi:v3.6.2 + image: quay.io/cephcsi/cephcsi:v3.6-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 a4d0de3c9..a868fa725 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml @@ -116,7 +116,7 @@ spec: mountPath: /csi - name: csi-rbdplugin # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v3.6.2 + image: quay.io/cephcsi/cephcsi:v3.6-canary args: - "--nodeid=$(NODE_ID)" - "--type=rbd" @@ -172,7 +172,7 @@ spec: readOnly: true - name: csi-rbdplugin-controller # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v3.6.2 + image: quay.io/cephcsi/cephcsi:v3.6-canary args: - "--type=controller" - "--v=5" @@ -192,7 +192,7 @@ spec: - name: ceph-config mountPath: /etc/ceph/ - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:v3.6.2 + image: quay.io/cephcsi/cephcsi:v3.6-canary args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml index 5db481034..e41fd5905 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin.yaml @@ -51,7 +51,7 @@ spec: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v3.6.2 + image: quay.io/cephcsi/cephcsi:v3.6-canary args: - "--nodeid=$(NODE_ID)" - "--pluginpath=/var/lib/kubelet/plugins" @@ -126,7 +126,7 @@ spec: securityContext: privileged: true allowPrivilegeEscalation: true - image: quay.io/cephcsi/cephcsi:v3.6.2 + image: quay.io/cephcsi/cephcsi:v3.6-canary args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/scripts/minikube.sh b/scripts/minikube.sh index 86c7bcb5d..9f1331060 100755 --- a/scripts/minikube.sh +++ b/scripts/minikube.sh @@ -177,7 +177,7 @@ else fi # configure csi image version -CSI_IMAGE_VERSION=${CSI_IMAGE_VERSION:-"v3.6.2"} +CSI_IMAGE_VERSION=${CSI_IMAGE_VERSION:-"v3.6-canary"} #feature-gates for kube K8S_FEATURE_GATES=${K8S_FEATURE_GATES:-""}