From 71a467249fa467b07a84a56c0f1b225e1ba39de9 Mon Sep 17 00:00:00 2001 From: Rakshith R Date: Wed, 29 Nov 2023 16:14:08 +0530 Subject: [PATCH] deploy: update templates to v3.10.0 This commit updates templates to new v3.10.0 release. Pending Release Notes is also reset. Signed-off-by: Rakshith R --- PendingReleaseNotes.md | 13 ------------- build.env | 2 +- charts/ceph-csi-cephfs/values.yaml | 2 +- charts/ceph-csi-rbd/values.yaml | 2 +- .../kubernetes/csi-cephfsplugin-provisioner.yaml | 5 ++--- deploy/cephfs/kubernetes/csi-cephfsplugin.yaml | 5 ++--- .../nfs/kubernetes/csi-nfsplugin-provisioner.yaml | 5 ++--- deploy/nfs/kubernetes/csi-nfsplugin.yaml | 3 +-- .../rbd/kubernetes/csi-rbdplugin-provisioner.yaml | 8 +++----- deploy/rbd/kubernetes/csi-rbdplugin.yaml | 5 ++--- 10 files changed, 15 insertions(+), 35 deletions(-) diff --git a/PendingReleaseNotes.md b/PendingReleaseNotes.md index f93d0a89f..3c1f8cf61 100644 --- a/PendingReleaseNotes.md +++ b/PendingReleaseNotes.md @@ -2,19 +2,6 @@ ## Breaking Changes -- Removed the deprecated grpc metrics flag's in [PR](https://github.com/ceph/ceph-csi/pull/4225) - -- Support for pre-creation of cephFS subvolumegroup before creating subvolume - is removed in [PR](https://github.com/ceph/ceph-csi/pull/4195) - ## Features -- Support for configuring read affinity for individuals cluster within the ceph-csi-config - ConfigMap in [PR](https://github.com/ceph/ceph-csi/pull/4165) - -- Support for CephFS kernel and fuse mount options per cluster in [PR](https://github.com/ceph/ceph-csi/pull/4245) - ## NOTE - -- Support is limited to only the active Ceph releases. Support for EOLed Ceph - releases are removed [PR](https://github.com/ceph/ceph-csi/pull/4262) diff --git a/build.env b/build.env index be3d80a14..00bc2829a 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.10.0 # 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 0d893eb9e..0768de2b2 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: canary + tag: v3.10.0 pullPolicy: IfNotPresent resources: {} diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index f8c3ae073..95a414d3e 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: canary + tag: v3.10.0 pullPolicy: IfNotPresent resources: {} diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml index f92b9cd48..a244ceb41 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml @@ -94,8 +94,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-cephfsplugin - # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.10.0 args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -143,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:canary + image: quay.io/cephcsi/cephcsi:v3.10.0 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml index a38ace99f..96bc31322 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml @@ -48,8 +48,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.10.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.10.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 b68488ff4..7c3146ebc 100644 --- a/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml +++ b/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml @@ -88,8 +88,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-nfsplugin - # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.10.0 args: - "--nodeid=$(NODE_ID)" - "--type=nfs" @@ -121,7 +120,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.10.0 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/nfs/kubernetes/csi-nfsplugin.yaml b/deploy/nfs/kubernetes/csi-nfsplugin.yaml index 6cb651936..6f6504a70 100644 --- a/deploy/nfs/kubernetes/csi-nfsplugin.yaml +++ b/deploy/nfs/kubernetes/csi-nfsplugin.yaml @@ -48,8 +48,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.10.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 d837a7af2..b7ad236f9 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml @@ -116,8 +116,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-rbdplugin - # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.10.0 args: - "--nodeid=$(NODE_ID)" - "--type=rbd" @@ -173,8 +172,7 @@ spec: mountPath: /run/secrets/tokens readOnly: true - 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.10.0 args: - "--type=controller" - "--v=5" @@ -195,7 +193,7 @@ spec: - name: ceph-config mountPath: /etc/ceph/ - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.10.0 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml index 7e3b33f4a..f2d81f1e3 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin.yaml @@ -50,8 +50,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.10.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.10.0 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)"