From 42797edd7e5e640e755a948a018d69c9200b7e60 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Fri, 16 Aug 2024 06:17:19 +0200 Subject: [PATCH] build: prepare of 3.12.0 updating the required templates and document for the 3.12.0 release. Signed-off-by: Madhu Rajanna --- PendingReleaseNotes.md | 9 --------- 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(+), 31 deletions(-) diff --git a/PendingReleaseNotes.md b/PendingReleaseNotes.md index a77eb58d4..ade3a3e70 100644 --- a/PendingReleaseNotes.md +++ b/PendingReleaseNotes.md @@ -4,13 +4,4 @@ ## Features -- deploy: podSecurityContexts can be configured for ceph-csi-cephfs chart in [PR](https://github.com/ceph/ceph-csi/pull/4664). -- deploy: podSecurityContexts can be configured for ceph-csi-rbd chart in [PR](https://github.com/ceph/ceph-csi/pull/4668) -- deploy: instanceID can be optionally configured for ceph-csi charts in [PR](https://github.com/ceph/ceph-csi/pull/4666) -- rbd: add support for flattenMode option for replication in [PR](https://github.com/ceph/ceph-csi/pull/4678) -- cephfs: support omap data store in radosnamespace via cli argument in [PR](https://github.com/ceph/ceph-csi/pull/4652) -- deploy: radosNamespaceCephFS can be configured for ceph-csi-cephfs chart in [PR](https://github.com/ceph/ceph-csi/pull/4652) -- build: update ceph release to squid in [PR](https://github.com/ceph/ceph-csi/pull/4735) -- build: CentOS Stream 9 is used as OS in the container-images [PR](https://github.com/ceph/ceph-csi/pull/4735) - ## NOTE diff --git a/build.env b/build.env index 2ccc79324..a61347800 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.12.0 # cephcsi upgrade version CSI_UPGRADE_VERSION=v3.11.0 diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml index f2cc91b25..2e604f14a 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: canary + tag: v3.12.0 pullPolicy: IfNotPresent resources: {} diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index 4ec49deee..bd05749a6 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml @@ -146,7 +146,7 @@ nodeplugin: plugin: image: repository: quay.io/cephcsi/cephcsi - tag: canary + tag: v3.12.0 pullPolicy: IfNotPresent resources: {} diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml index 6685b16cf..ac75e778c 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.12.0 args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -143,7 +142,7 @@ spec: - name: socket-dir mountPath: /csi - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.12.0 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml index f609df6a5..0b1bf737a 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.12.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.12.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 37e0fc4ba..7d7a3a1e3 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.12.0 args: - "--nodeid=$(NODE_ID)" - "--type=nfs" @@ -121,7 +120,7 @@ spec: - name: socket-dir mountPath: /csi - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.12.0 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/nfs/kubernetes/csi-nfsplugin.yaml b/deploy/nfs/kubernetes/csi-nfsplugin.yaml index e6c138eff..8bbfe258b 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.12.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 77e44da8d..a498fb56f 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.12.0 args: - "--nodeid=$(NODE_ID)" - "--type=rbd" @@ -172,8 +171,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.12.0 args: - "--type=controller" - "--v=5" @@ -194,7 +192,7 @@ spec: - name: ceph-config mountPath: /etc/ceph/ - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.12.0 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml index 0d3dd57c6..6f5b4d182 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.12.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.12.0 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)"