From 46caf604b8758ff54ece10434d093f2667680d88 Mon Sep 17 00:00:00 2001 From: Rakshith R Date: Tue, 10 Dec 2024 15:31:42 +0530 Subject: [PATCH] build: prepare of 3.13.0 This commit updates the required templates and document for the 3.13.0 release. Signed-off-by: Rakshith R --- PendingReleaseNotes.md | 8 -------- build.env | 2 +- charts/ceph-csi-cephfs/values.yaml | 2 +- charts/ceph-csi-rbd/values.yaml | 2 +- .../cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml | 5 ++--- deploy/cephfs/kubernetes/csi-cephfsplugin.yaml | 5 ++--- deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml | 5 ++--- deploy/nfs/kubernetes/csi-nfsplugin.yaml | 3 +-- deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml | 8 +++----- deploy/rbd/kubernetes/csi-rbdplugin.yaml | 5 ++--- 10 files changed, 15 insertions(+), 30 deletions(-) diff --git a/PendingReleaseNotes.md b/PendingReleaseNotes.md index 76de0dfb873..ba112e537e5 100644 --- a/PendingReleaseNotes.md +++ b/PendingReleaseNotes.md @@ -4,12 +4,4 @@ ## Features -- util: a log message "Slow GRPC" is now emitted when - CSI GRPC call outlives its deadline [PR](https://github.com/ceph/ceph-csi/pull/4847) -- CSI metrics for sidecars are now exposed at `POD_IP`:`SIDECAR_ENDPOINT`/`metrics` - path. Check sidecar container spec for `SIDECAR_ENDPOINT` - value [PR](https://github.com/ceph/ceph-csi/pull/4887) -- cephfs: support omap data store in radosnamespace [PR](https://github.com/ceph/ceph-csi/pull/4661) -- helm: Support setting nodepluigin and provisioner annotations - ## NOTE diff --git a/build.env b/build.env index fa48af57035..d35477e9c0d 100644 --- a/build.env +++ b/build.env @@ -9,7 +9,7 @@ # get proporly expanded. # # cephcsi image version -CSI_IMAGE_VERSION=canary +CSI_IMAGE_VERSION=v3.13.0 # cephcsi upgrade version CSI_UPGRADE_VERSION=v3.12.1 diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml index fa611cae312..f30e2b7767c 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: canary + tag: v3.13.0 pullPolicy: IfNotPresent resources: {} diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index aa17fed9570..91d4ad2d636 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: canary + tag: v3.13.0 pullPolicy: IfNotPresent resources: {} diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml index 9443b3ea4fd..6243e271faf 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml @@ -43,8 +43,7 @@ spec: priorityClassName: system-cluster-critical containers: - name: csi-cephfsplugin - # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.13.0 args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -170,7 +169,7 @@ spec: - name: socket-dir mountPath: /csi - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.13.0 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml index f609df6a52d..863041a2d1c 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml @@ -26,8 +26,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.13.0 args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -125,7 +124,7 @@ spec: securityContext: privileged: true allowPrivilegeEscalation: true - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.13.0 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 c2e3963e87d..bfb37d754ff 100644 --- a/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml +++ b/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml @@ -40,8 +40,7 @@ spec: topologyKey: "kubernetes.io/hostname" containers: - name: csi-nfsplugin - # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.13.0 args: - "--nodeid=$(NODE_ID)" - "--type=nfs" @@ -148,7 +147,7 @@ spec: - name: socket-dir mountPath: /csi - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.13.0 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/nfs/kubernetes/csi-nfsplugin.yaml b/deploy/nfs/kubernetes/csi-nfsplugin.yaml index e6c138eff34..b3135da729a 100644 --- a/deploy/nfs/kubernetes/csi-nfsplugin.yaml +++ b/deploy/nfs/kubernetes/csi-nfsplugin.yaml @@ -26,8 +26,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.13.0 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 2ac2b92179b..474c5a8c982 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml @@ -47,8 +47,7 @@ spec: priorityClassName: system-cluster-critical containers: - name: csi-rbdplugin - # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.13.0 args: - "--nodeid=$(NODE_ID)" - "--type=rbd" @@ -209,8 +208,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-rbdplugin-controller - # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.13.0 args: - "--type=controller" - "--v=5" @@ -231,7 +229,7 @@ spec: - name: ceph-config mountPath: /etc/ceph/ - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.13.0 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml index 0d3dd57c665..b01e40ded53 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin.yaml @@ -28,8 +28,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.13.0 args: - "--nodeid=$(NODE_ID)" - "--pluginpath=/var/lib/kubelet/plugins" @@ -135,7 +134,7 @@ spec: securityContext: privileged: true allowPrivilegeEscalation: true - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.13.0 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)"