From 2790daac39eac01c7d85afc004d072beef099887 Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Tue, 5 Apr 2022 21:32:00 +0530 Subject: [PATCH] deploy: update deployment templates to point to 3.6-canary images This commit revert the deployment templates in release 3.6 branch to canary. Signed-off-by: Humble Chirammal --- 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 cfa7d12a1..a678d163b 100644 --- a/build.env +++ b/build.env @@ -9,7 +9,7 @@ # get proporly expanded. # # cephcsi image version -CSI_IMAGE_VERSION=v3.6.0 +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 50b2bc5fe..a130c520e 100644 --- a/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml @@ -87,7 +87,7 @@ nodeplugin: plugin: image: repository: quay.io/cephcsi/cephcsi - tag: v3.6.0 + tag: v3.6-canary pullPolicy: IfNotPresent resources: {} diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index 267f54877..b99ff3ad6 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml @@ -109,7 +109,7 @@ nodeplugin: plugin: image: repository: quay.io/cephcsi/cephcsi - tag: v3.6.0 + 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 40e6e013c..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.0 + 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.0 + 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 b7ad560db..5835299f0 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin.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.6.0 + image: quay.io/cephcsi/cephcsi:v3.6-canary args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -105,7 +105,7 @@ spec: - name: liveness-prometheus securityContext: privileged: true - image: quay.io/cephcsi/cephcsi:v3.6.0 + 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 484b0935a..f0446e694 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml @@ -112,7 +112,7 @@ spec: mountPath: /csi - name: csi-rbdplugin # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v3.6.0 + image: quay.io/cephcsi/cephcsi:v3.6-canary args: - "--nodeid=$(NODE_ID)" - "--type=rbd" @@ -168,7 +168,7 @@ spec: readOnly: true - name: csi-rbdplugin-controller # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v3.6.0 + image: quay.io/cephcsi/cephcsi:v3.6-canary args: - "--type=controller" - "--v=5" @@ -188,7 +188,7 @@ spec: - name: ceph-config mountPath: /etc/ceph/ - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:v3.6.0 + 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 8443a91e2..a5687c713 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin.yaml @@ -50,7 +50,7 @@ spec: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v3.6.0 + image: quay.io/cephcsi/cephcsi:v3.6-canary args: - "--nodeid=$(NODE_ID)" - "--pluginpath=/var/lib/kubelet/plugins" @@ -124,7 +124,7 @@ spec: - name: liveness-prometheus securityContext: privileged: true - image: quay.io/cephcsi/cephcsi:v3.6.0 + 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 e5c353759..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.0"} +CSI_IMAGE_VERSION=${CSI_IMAGE_VERSION:-"v3.6-canary"} #feature-gates for kube K8S_FEATURE_GATES=${K8S_FEATURE_GATES:-""}