From c31cdca8eeb1bb7ec003c843d1fdebe176445be4 Mon Sep 17 00:00:00 2001 From: Riya Singhal Date: Wed, 20 Dec 2023 10:09:10 +0530 Subject: [PATCH] revert: revert to 3.10-canary This commit makes template changes for 3.10 release branch to use 3.10-canary tag. Signed-off-by: Riya Singhal --- 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 f713c672c..ea5af0356 100644 --- a/build.env +++ b/build.env @@ -9,7 +9,7 @@ # get proporly expanded. # # cephcsi image version -CSI_IMAGE_VERSION=v3.10.1 +CSI_IMAGE_VERSION=v3.10-canary # cephcsi upgrade version CSI_UPGRADE_VERSION=v3.9.0 diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml index fd681c187..a64fe18a4 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.10.1 + tag: v3.10-canary pullPolicy: IfNotPresent resources: {} diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index 0d754188c..f0ae0a81e 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml @@ -127,7 +127,7 @@ nodeplugin: plugin: image: repository: quay.io/cephcsi/cephcsi - tag: v3.10.1 + tag: v3.10-canary pullPolicy: IfNotPresent resources: {} diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml index 14af22fec..c78e4415b 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.10.1 + image: quay.io/cephcsi/cephcsi:v3.10-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.10.1 + image: quay.io/cephcsi/cephcsi:v3.10-canary args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml index a543e1e05..72caa221d 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.10.1 + image: quay.io/cephcsi/cephcsi:v3.10-canary args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -124,7 +124,7 @@ spec: securityContext: privileged: true allowPrivilegeEscalation: true - image: quay.io/cephcsi/cephcsi:v3.10.1 + image: quay.io/cephcsi/cephcsi:v3.10-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 2893593a1..ab240f823 100644 --- a/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml +++ b/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml @@ -88,7 +88,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-nfsplugin - image: quay.io/cephcsi/cephcsi:v3.10.1 + image: quay.io/cephcsi/cephcsi:v3.10-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.10.1 + image: quay.io/cephcsi/cephcsi:v3.10-canary args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/nfs/kubernetes/csi-nfsplugin.yaml b/deploy/nfs/kubernetes/csi-nfsplugin.yaml index 4befc30bd..c1189193f 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.10.1 + image: quay.io/cephcsi/cephcsi:v3.10-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 fd921d444..41114644c 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.10.1 + image: quay.io/cephcsi/cephcsi:v3.10-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.10.1 + image: quay.io/cephcsi/cephcsi:v3.10-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.10.1 + image: quay.io/cephcsi/cephcsi:v3.10-canary args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml index 5cbbc615a..ea691d1a1 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.10.1 + image: quay.io/cephcsi/cephcsi:v3.10-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.10.1 + image: quay.io/cephcsi/cephcsi:v3.10-canary args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)"