From 81dc96474066d9ae6737375acc51c61f27374052 Mon Sep 17 00:00:00 2001 From: Rakshith R Date: Thu, 6 Jul 2023 11:37:58 +0530 Subject: [PATCH] revert: revert to 3.9-canary This commit makes template changes for 3.9 release branch to use 3.9-canary tag. Signed-off-by: Rakshith R --- 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/nfs/kubernetes/csi-nfsplugin-provisioner.yaml | 4 ++-- deploy/nfs/kubernetes/csi-nfsplugin.yaml | 2 +- deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml | 6 +++--- deploy/rbd/kubernetes/csi-rbdplugin.yaml | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/build.env b/build.env index d3111874f..cc6360ded 100644 --- a/build.env +++ b/build.env @@ -9,7 +9,7 @@ # get proporly expanded. # # cephcsi image version -CSI_IMAGE_VERSION=v3.9.0 +CSI_IMAGE_VERSION=v3.9-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 05f48e4c3..c78768aa5 100644 --- a/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml @@ -99,7 +99,7 @@ nodeplugin: plugin: image: repository: quay.io/cephcsi/cephcsi - tag: v3.9.0 + tag: v3.9-canary pullPolicy: IfNotPresent resources: {} diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index 2b2a03541..d409ecd6b 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml @@ -122,7 +122,7 @@ nodeplugin: plugin: image: repository: quay.io/cephcsi/cephcsi - tag: v3.9.0 + tag: v3.9-canary pullPolicy: IfNotPresent resources: {} diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml index 66a31b767..011970f6f 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml @@ -94,7 +94,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-cephfsplugin - image: quay.io/cephcsi/cephcsi:v3.9.0 + image: quay.io/cephcsi/cephcsi:v3.9-canary args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -142,7 +142,7 @@ spec: - name: ceph-csi-encryption-kms-config mountPath: /etc/ceph-csi-encryption-kms-config/ - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:v3.9.0 + image: quay.io/cephcsi/cephcsi:v3.9-canary args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml index cab91159a..ba4c2ae5a 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml @@ -48,7 +48,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - image: quay.io/cephcsi/cephcsi:v3.9.0 + image: quay.io/cephcsi/cephcsi:v3.9-canary args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -115,7 +115,7 @@ spec: securityContext: privileged: true allowPrivilegeEscalation: true - image: quay.io/cephcsi/cephcsi:v3.9.0 + image: quay.io/cephcsi/cephcsi:v3.9-canary args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml b/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml index cbb6a561d..fb0c6b4a0 100644 --- a/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml +++ b/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml @@ -87,7 +87,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-nfsplugin - image: quay.io/cephcsi/cephcsi:v3.9.0 + image: quay.io/cephcsi/cephcsi:v3.9-canary args: - "--nodeid=$(NODE_ID)" - "--type=nfs" @@ -119,7 +119,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:v3.9.0 + image: quay.io/cephcsi/cephcsi:v3.9-canary args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/nfs/kubernetes/csi-nfsplugin.yaml b/deploy/nfs/kubernetes/csi-nfsplugin.yaml index 1374ee036..880bad0e8 100644 --- a/deploy/nfs/kubernetes/csi-nfsplugin.yaml +++ b/deploy/nfs/kubernetes/csi-nfsplugin.yaml @@ -48,7 +48,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - image: quay.io/cephcsi/cephcsi:v3.9.0 + image: quay.io/cephcsi/cephcsi:v3.9-canary args: - "--nodeid=$(NODE_ID)" - "--type=nfs" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml index 876e9bdde..2577de819 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml @@ -116,7 +116,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-rbdplugin - image: quay.io/cephcsi/cephcsi:v3.9.0 + image: quay.io/cephcsi/cephcsi:v3.9-canary args: - "--nodeid=$(NODE_ID)" - "--type=rbd" @@ -172,7 +172,7 @@ spec: mountPath: /run/secrets/tokens readOnly: true - name: csi-rbdplugin-controller - image: quay.io/cephcsi/cephcsi:v3.9.0 + image: quay.io/cephcsi/cephcsi:v3.9-canary args: - "--type=controller" - "--v=5" @@ -193,7 +193,7 @@ spec: - name: ceph-config mountPath: /etc/ceph/ - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:v3.9.0 + image: quay.io/cephcsi/cephcsi:v3.9-canary args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml index 01070790e..74babefb8 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin.yaml @@ -50,7 +50,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - image: quay.io/cephcsi/cephcsi:v3.9.0 + image: quay.io/cephcsi/cephcsi:v3.9-canary args: - "--nodeid=$(NODE_ID)" - "--pluginpath=/var/lib/kubelet/plugins" @@ -134,7 +134,7 @@ spec: securityContext: privileged: true allowPrivilegeEscalation: true - image: quay.io/cephcsi/cephcsi:v3.9.0 + image: quay.io/cephcsi/cephcsi:v3.9-canary args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)"