From 2339301c18b875d2c52145935c92175fc20a5720 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Fri, 2 Feb 2024 10:15:07 +0100 Subject: [PATCH] build: update for 3.10.2 release This PR contains the required doc and template updates for cephcsi 3.10.2 release Signed-off-by: Madhu Rajanna --- README.md | 2 ++ 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 ++-- docs/ceph-csi-upgrade.md | 4 ++-- 11 files changed, 19 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index c7b55361f..150dc7d40 100644 --- a/README.md +++ b/README.md @@ -56,6 +56,7 @@ environments. | Ceph CSI Version | Container Orchestrator Name | Version Tested | | -----------------| --------------------------- | -------------------| +| v3.10.2 | Kubernetes | v1.26, v1.27, v1.28| | v3.10.1 | Kubernetes | v1.26, v1.27, v1.28| | v3.10.0 | Kubernetes | v1.26, v1.27, v1.28| | v3.9.0 | Kubernetes | v1.25, v1.26, v1.27| @@ -129,6 +130,7 @@ in the Kubernetes documentation. | Ceph CSI Release/Branch | Container image name | Image Tag | | ----------------------- | ---------------------------- | --------- | | devel (Branch) | quay.io/cephcsi/cephcsi | canary | +| v3.10.2 (Release) | quay.io/cephcsi/cephcsi | v3.10.2 | | v3.10.1 (Release) | quay.io/cephcsi/cephcsi | v3.10.1 | | v3.10.0 (Release) | quay.io/cephcsi/cephcsi | v3.10.0 | | v3.9.0 (Release) | quay.io/cephcsi/cephcsi | v3.9.0 | diff --git a/build.env b/build.env index ea5af0356..ff64c1a77 100644 --- a/build.env +++ b/build.env @@ -9,7 +9,7 @@ # get proporly expanded. # # cephcsi image version -CSI_IMAGE_VERSION=v3.10-canary +CSI_IMAGE_VERSION=v3.10.2 # 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 a64fe18a4..1dc1052bb 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: v3.10-canary + tag: v3.10.2 pullPolicy: IfNotPresent resources: {} diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index f0ae0a81e..53b3cd7bc 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: v3.10-canary + tag: v3.10.2 pullPolicy: IfNotPresent resources: {} diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml index c78e4415b..c297f2a91 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml @@ -94,7 +94,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-cephfsplugin - image: quay.io/cephcsi/cephcsi:v3.10-canary + image: quay.io/cephcsi/cephcsi:v3.10.2 args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -142,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:v3.10-canary + image: quay.io/cephcsi/cephcsi:v3.10.2 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml index 72caa221d..ca83de3f4 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml @@ -48,7 +48,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - image: quay.io/cephcsi/cephcsi:v3.10-canary + image: quay.io/cephcsi/cephcsi:v3.10.2 args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -124,7 +124,7 @@ spec: securityContext: privileged: true allowPrivilegeEscalation: true - image: quay.io/cephcsi/cephcsi:v3.10-canary + image: quay.io/cephcsi/cephcsi:v3.10.2 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 ab240f823..86784c6ad 100644 --- a/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml +++ b/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml @@ -88,7 +88,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-nfsplugin - image: quay.io/cephcsi/cephcsi:v3.10-canary + image: quay.io/cephcsi/cephcsi:v3.10.2 args: - "--nodeid=$(NODE_ID)" - "--type=nfs" @@ -120,7 +120,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:v3.10-canary + image: quay.io/cephcsi/cephcsi:v3.10.2 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/nfs/kubernetes/csi-nfsplugin.yaml b/deploy/nfs/kubernetes/csi-nfsplugin.yaml index c1189193f..5b49f828c 100644 --- a/deploy/nfs/kubernetes/csi-nfsplugin.yaml +++ b/deploy/nfs/kubernetes/csi-nfsplugin.yaml @@ -48,7 +48,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - image: quay.io/cephcsi/cephcsi:v3.10-canary + image: quay.io/cephcsi/cephcsi:v3.10.2 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 41114644c..a6383ff24 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml @@ -116,7 +116,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-rbdplugin - image: quay.io/cephcsi/cephcsi:v3.10-canary + image: quay.io/cephcsi/cephcsi:v3.10.2 args: - "--nodeid=$(NODE_ID)" - "--type=rbd" @@ -172,7 +172,7 @@ spec: mountPath: /run/secrets/tokens readOnly: true - name: csi-rbdplugin-controller - image: quay.io/cephcsi/cephcsi:v3.10-canary + image: quay.io/cephcsi/cephcsi:v3.10.2 args: - "--type=controller" - "--v=5" @@ -193,7 +193,7 @@ spec: - name: ceph-config mountPath: /etc/ceph/ - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:v3.10-canary + image: quay.io/cephcsi/cephcsi:v3.10.2 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml index ea691d1a1..542830984 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin.yaml @@ -50,7 +50,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - image: quay.io/cephcsi/cephcsi:v3.10-canary + image: quay.io/cephcsi/cephcsi:v3.10.2 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.10-canary + image: quay.io/cephcsi/cephcsi:v3.10.2 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/docs/ceph-csi-upgrade.md b/docs/ceph-csi-upgrade.md index f37890e3f..628a7d1a6 100644 --- a/docs/ceph-csi-upgrade.md +++ b/docs/ceph-csi-upgrade.md @@ -95,12 +95,12 @@ For example, upgrading from 3.8 to 3.10 is not recommended. [release notes](https://github.com/ceph/ceph-csi/releases/tag/v3.10.0) before proceeding further.** -git checkout v3.10.0 tag +git checkout v3.10.2 tag ```bash git clone https://github.com/ceph/ceph-csi.git cd ./ceph-csi -git checkout v3.10.0 +git checkout v3.10.2 ``` ```console