From ca12516d97067fd40e4b7a221e256524ddd7f7f7 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Mon, 23 Jun 2025 13:16:09 +0200 Subject: [PATCH] revert: prepare for v3.14.1 This reverts commit 4d7f8684f093191939bc01bb94b5a0ff43cbcf7b. Signed-off-by: Madhu Rajanna --- 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 6a83c1bef1a..a36e74cb6e9 100644 --- a/build.env +++ b/build.env @@ -9,7 +9,7 @@ # get proporly expanded. # # cephcsi image version -CSI_IMAGE_VERSION=v3.14.1 +CSI_IMAGE_VERSION=v3.14-canary # cephcsi upgrade version CSI_UPGRADE_VERSION=v3.13.1 diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml index 8111553b78c..de99b8699ff 100644 --- a/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml @@ -138,7 +138,7 @@ nodeplugin: plugin: image: repository: quay.io/cephcsi/cephcsi - tag: v3.14.1 + tag: v3.14-canary pullPolicy: IfNotPresent resources: {} diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index 24a28d80afd..88702f40450 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml @@ -149,7 +149,7 @@ nodeplugin: plugin: image: repository: quay.io/cephcsi/cephcsi - tag: v3.14.1 + tag: v3.14-canary pullPolicy: IfNotPresent resources: {} diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml index cba617e0e56..09c720cdef0 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.14.1 + image: quay.io/cephcsi/cephcsi:v3.14-canary args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -169,7 +169,7 @@ spec: - name: socket-dir mountPath: /csi - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:v3.14.1 + image: quay.io/cephcsi/cephcsi:v3.14-canary args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml index f4249f47193..c81426b2fb0 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.14.1 + image: quay.io/cephcsi/cephcsi:v3.14-canary args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -124,7 +124,7 @@ spec: securityContext: privileged: true allowPrivilegeEscalation: true - image: quay.io/cephcsi/cephcsi:v3.14.1 + image: quay.io/cephcsi/cephcsi:v3.14-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 0bd7fd8e7cc..4890b5f75b2 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.14.1 + image: quay.io/cephcsi/cephcsi:v3.14-canary args: - "--nodeid=$(NODE_ID)" - "--type=nfs" @@ -147,7 +147,7 @@ spec: - name: socket-dir mountPath: /csi - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:v3.14.1 + image: quay.io/cephcsi/cephcsi:v3.14-canary args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/nfs/kubernetes/csi-nfsplugin.yaml b/deploy/nfs/kubernetes/csi-nfsplugin.yaml index 185f5dda7c3..4a75fe2d2f5 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.14.1 + image: quay.io/cephcsi/cephcsi:v3.14-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 c01ef5226b6..056c8fbfa04 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.14.1 + image: quay.io/cephcsi/cephcsi:v3.14-canary args: - "--nodeid=$(NODE_ID)" - "--type=rbd" @@ -208,7 +208,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-rbdplugin-controller - image: quay.io/cephcsi/cephcsi:v3.14.1 + image: quay.io/cephcsi/cephcsi:v3.14-canary args: - "--type=controller" - "--v=5" @@ -229,7 +229,7 @@ spec: - name: ceph-config mountPath: /etc/ceph/ - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:v3.14.1 + image: quay.io/cephcsi/cephcsi:v3.14-canary args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml index 66d1592384e..2ea694305ee 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.14.1 + image: quay.io/cephcsi/cephcsi:v3.14-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.14.1 + image: quay.io/cephcsi/cephcsi:v3.14-canary args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)"