From a9415f82e98f2128b296b5025c8c237409e11752 Mon Sep 17 00:00:00 2001 From: Rakshith R Date: Mon, 24 Jul 2023 11:02:35 +0530 Subject: [PATCH] revert: revert template changes done for v3.8.1 release This commit reverts the changes made for 3.8.1 release back to v3.8-canary. 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 b0d52522b..8f7f76057 100644 --- a/build.env +++ b/build.env @@ -9,7 +9,7 @@ # get proporly expanded. # # cephcsi image version -CSI_IMAGE_VERSION=v3.8.1 +CSI_IMAGE_VERSION=v3.8-canary # cephcsi upgrade version CSI_UPGRADE_VERSION=v3.7.2 diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml index 0faad966f..78d4165c7 100644 --- a/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml @@ -94,7 +94,7 @@ nodeplugin: plugin: image: repository: quay.io/cephcsi/cephcsi - tag: v3.8.1 + tag: v3.8-canary pullPolicy: IfNotPresent resources: {} diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index be2629f17..d8da9ded7 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml @@ -117,7 +117,7 @@ nodeplugin: plugin: image: repository: quay.io/cephcsi/cephcsi - tag: v3.8.1 + tag: v3.8-canary pullPolicy: IfNotPresent resources: {} diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml index 09f8a2864..b0c955293 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml @@ -95,7 +95,7 @@ spec: mountPath: /csi - name: csi-cephfsplugin # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v3.8.1 + image: quay.io/cephcsi/cephcsi:v3.8-canary args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -143,7 +143,7 @@ spec: - name: ceph-csi-encryption-kms-config mountPath: /etc/ceph-csi-encryption-kms-config/ - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:v3.8.1 + image: quay.io/cephcsi/cephcsi:v3.8-canary args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml index 8e6a4daa9..4f9ba3333 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.8.1 + image: quay.io/cephcsi/cephcsi:v3.8-canary args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -116,7 +116,7 @@ spec: securityContext: privileged: true allowPrivilegeEscalation: true - image: quay.io/cephcsi/cephcsi:v3.8.1 + image: quay.io/cephcsi/cephcsi:v3.8-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 2697b0eae..e12d2061f 100644 --- a/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml +++ b/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml @@ -88,7 +88,7 @@ spec: mountPath: /csi - name: csi-nfsplugin # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v3.8.1 + image: quay.io/cephcsi/cephcsi:v3.8-canary args: - "--nodeid=$(NODE_ID)" - "--type=nfs" @@ -120,7 +120,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:v3.8.1 + image: quay.io/cephcsi/cephcsi:v3.8-canary args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/nfs/kubernetes/csi-nfsplugin.yaml b/deploy/nfs/kubernetes/csi-nfsplugin.yaml index 23c50008a..8852e3cc3 100644 --- a/deploy/nfs/kubernetes/csi-nfsplugin.yaml +++ b/deploy/nfs/kubernetes/csi-nfsplugin.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.8.1 + image: quay.io/cephcsi/cephcsi:v3.8-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 c1cb39cf5..70b3c98ee 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml @@ -117,7 +117,7 @@ spec: mountPath: /csi - name: csi-rbdplugin # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v3.8.1 + image: quay.io/cephcsi/cephcsi:v3.8-canary args: - "--nodeid=$(NODE_ID)" - "--type=rbd" @@ -174,7 +174,7 @@ spec: readOnly: true - name: csi-rbdplugin-controller # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:v3.8.1 + image: quay.io/cephcsi/cephcsi:v3.8-canary args: - "--type=controller" - "--v=5" @@ -195,7 +195,7 @@ spec: - name: ceph-config mountPath: /etc/ceph/ - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:v3.8.1 + image: quay.io/cephcsi/cephcsi:v3.8-canary args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml index 5df9e8289..f873480f1 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.8.1 + image: quay.io/cephcsi/cephcsi:v3.8-canary args: - "--nodeid=$(NODE_ID)" - "--pluginpath=/var/lib/kubelet/plugins" @@ -135,7 +135,7 @@ spec: securityContext: privileged: true allowPrivilegeEscalation: true - image: quay.io/cephcsi/cephcsi:v3.8.1 + image: quay.io/cephcsi/cephcsi:v3.8-canary args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)"