From 2ee72f03919814194ee3726df76956bf138943b0 Mon Sep 17 00:00:00 2001 From: Rakshith R Date: Tue, 2 Apr 2024 20:38:52 +0530 Subject: [PATCH] revert: revert to 3.11-canary This commit makes template changes for 3.11 release branch to use 3.11-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 1dfed3dc1..c2bfe8009 100644 --- a/build.env +++ b/build.env @@ -9,7 +9,7 @@ # get proporly expanded. # # cephcsi image version -CSI_IMAGE_VERSION=v3.11.0 +CSI_IMAGE_VERSION=v3.11-canary # cephcsi upgrade version CSI_UPGRADE_VERSION=v3.10.2 diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml index c62833526..3fbc538e4 100644 --- a/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml @@ -117,7 +117,7 @@ nodeplugin: plugin: image: repository: quay.io/cephcsi/cephcsi - tag: v3.11.0 + tag: v3.11-canary pullPolicy: IfNotPresent resources: {} diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index 0d0f77dd8..dc6c8d690 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml @@ -145,7 +145,7 @@ nodeplugin: plugin: image: repository: quay.io/cephcsi/cephcsi - tag: v3.11.0 + tag: v3.11-canary pullPolicy: IfNotPresent resources: {} diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml index f3cdfa438..b4a299999 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml @@ -43,7 +43,7 @@ spec: priorityClassName: system-cluster-critical containers: - name: csi-cephfsplugin - image: quay.io/cephcsi/cephcsi:v3.11.0 + image: quay.io/cephcsi/cephcsi:v3.11-canary args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -143,7 +143,7 @@ spec: - name: socket-dir mountPath: /csi - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:v3.11.0 + image: quay.io/cephcsi/cephcsi:v3.11-canary args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml index 9c7d9e0bf..175b24745 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml @@ -26,7 +26,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - image: quay.io/cephcsi/cephcsi:v3.11.0 + image: quay.io/cephcsi/cephcsi:v3.11-canary args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -124,7 +124,7 @@ spec: securityContext: privileged: true allowPrivilegeEscalation: true - image: quay.io/cephcsi/cephcsi:v3.11.0 + image: quay.io/cephcsi/cephcsi:v3.11-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 e272eedec..1a2287a0b 100644 --- a/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml +++ b/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml @@ -40,7 +40,7 @@ spec: topologyKey: "kubernetes.io/hostname" containers: - name: csi-nfsplugin - image: quay.io/cephcsi/cephcsi:v3.11.0 + image: quay.io/cephcsi/cephcsi:v3.11-canary args: - "--nodeid=$(NODE_ID)" - "--type=nfs" @@ -120,7 +120,7 @@ spec: - name: socket-dir mountPath: /csi - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:v3.11.0 + image: quay.io/cephcsi/cephcsi:v3.11-canary args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/nfs/kubernetes/csi-nfsplugin.yaml b/deploy/nfs/kubernetes/csi-nfsplugin.yaml index 38f879a43..55e3a6504 100644 --- a/deploy/nfs/kubernetes/csi-nfsplugin.yaml +++ b/deploy/nfs/kubernetes/csi-nfsplugin.yaml @@ -26,7 +26,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - image: quay.io/cephcsi/cephcsi:v3.11.0 + image: quay.io/cephcsi/cephcsi:v3.11-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 8c33198ef..40e9b3424 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml @@ -47,7 +47,7 @@ spec: priorityClassName: system-cluster-critical containers: - name: csi-rbdplugin - image: quay.io/cephcsi/cephcsi:v3.11.0 + image: quay.io/cephcsi/cephcsi:v3.11-canary args: - "--nodeid=$(NODE_ID)" - "--type=rbd" @@ -173,7 +173,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-rbdplugin-controller - image: quay.io/cephcsi/cephcsi:v3.11.0 + image: quay.io/cephcsi/cephcsi:v3.11-canary args: - "--type=controller" - "--v=5" @@ -194,7 +194,7 @@ spec: - name: ceph-config mountPath: /etc/ceph/ - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:v3.11.0 + image: quay.io/cephcsi/cephcsi:v3.11-canary args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml index 315bf56c8..dc354d84b 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin.yaml @@ -28,7 +28,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - image: quay.io/cephcsi/cephcsi:v3.11.0 + image: quay.io/cephcsi/cephcsi:v3.11-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.11.0 + image: quay.io/cephcsi/cephcsi:v3.11-canary args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)"