From 7299c23cfcacfe3ee098bb6eab5aab4470a9db16 Mon Sep 17 00:00:00 2001 From: Rakshith R Date: Mon, 1 Apr 2024 14:45:59 +0530 Subject: [PATCH 1/4] doc: update README for v3.11.0 release This commit updates README to deprecate 3.9.x release, add 3.10.1/2 release versions and pin latest release to v3.11.0 Signed-off-by: Rakshith R --- README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fe804bb416c..28e22fba912 100644 --- a/README.md +++ b/README.md @@ -56,8 +56,10 @@ environments. | Ceph CSI Version | Container Orchestrator Name | Version Tested | | -----------------| --------------------------- | -------------------| +| v3.11.0 | Kubernetes | v1.26, v1.27, v1.28, v1.29| +| 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| There is work in progress to make this CO-independent and thus support other orchestration environments (Nomad, Mesos..etc). @@ -128,11 +130,14 @@ in the Kubernetes documentation. | Ceph CSI Release/Branch | Container image name | Image Tag | | ----------------------- | ---------------------------- | --------- | | devel (Branch) | quay.io/cephcsi/cephcsi | canary | +| v3.11.0 (Release) | quay.io/cephcsi/cephcsi | v3.11.0 | +| 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 | | Deprecated Ceph CSI Release/Branch | Container image name | Image Tag | | ----------------------- | --------------------------------| --------- | +| v3.9.0 (Release) | quay.io/cephcsi/cephcsi | v3.9.0 | | v3.8.1 (Release) | quay.io/cephcsi/cephcsi | v3.8.1 | | v3.8.0 (Release) | quay.io/cephcsi/cephcsi | v3.8.0 | | v3.7.2 (Release) | quay.io/cephcsi/cephcsi | v3.7.2 | From 966cb60fae2401c38b766baaac162e7e2d88cc63 Mon Sep 17 00:00:00 2001 From: Rakshith R Date: Mon, 1 Apr 2024 14:52:04 +0530 Subject: [PATCH 2/4] doc: add steps for upgrading from 3.10 to 3.11 This commit adds steps for upgrading from 3.10 to 3.11. Signed-off-by: Rakshith R --- docs/ceph-csi-upgrade.md | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/docs/ceph-csi-upgrade.md b/docs/ceph-csi-upgrade.md index f37890e3f8a..2cc7675fd3e 100644 --- a/docs/ceph-csi-upgrade.md +++ b/docs/ceph-csi-upgrade.md @@ -4,7 +4,7 @@ - [Pre-upgrade considerations](#pre-upgrade-considerations) - [Snapshot-controller and snapshot crd](#snapshot-controller-and-snapshot-crd) - [Upgrading from previous releases](#upgrading-from-previous-releases) - - [Upgrading from v3.9 to v3.10](#upgrading-from-v39-to-v310) + - [Upgrading from v3.10 to v3.11](#upgrading-from-v310-to-v311) - [Upgrading CephFS](#upgrading-cephfs) - [1. Upgrade CephFS Provisioner resources](#1-upgrade-cephfs-provisioner-resources) - [1.1 Update the CephFS Provisioner RBAC](#11-update-the-cephfs-provisioner-rbac) @@ -49,7 +49,7 @@ To avoid this issue in future upgrades, we recommend that you do not use the fuse client as of now. This guide will walk you through the steps to upgrade the software in a cluster -from v3.9 to v3.10 +from v3.10 to v3.11 ### Snapshot-controller and snapshot crd @@ -77,8 +77,10 @@ To upgrade from previous releases, refer to the following: to upgrade from cephcsi v3.7 to v3.8 - [upgrade-from-v3.8-v3.9](https://github.com/ceph/ceph-csi/blob/v3.9.0/docs/ceph-csi-upgrade.md) to upgrade from cephcsi v3.8 to v3.9 +- [upgrade-from-v3.9-v3.10](https://github.com/ceph/ceph-csi/blob/v3.10.0/docs/ceph-csi-upgrade.md) + to upgrade from cephcsi v3.9 to v3.10 -## Upgrading from v3.9 to v3.10 +## Upgrading from v3.10 to v3.11 **Ceph-csi releases from devel are expressly unsupported.** It is strongly recommended that you use [official @@ -88,19 +90,19 @@ that will not be supported in the official releases. Builds from the devel branch can have functionality changed and even removed at any time without compatibility support and without prior notice. -**Also, we do not recommend any direct upgrades to 3.10 except from 3.9 to 3.10.** -For example, upgrading from 3.8 to 3.10 is not recommended. +**Also, we do not recommend any direct upgrades to 3.11 except from 3.10 to 3.11.** +For example, upgrading from 3.8 to 3.11 is not recommended. **Refer to the Breaking Changes Section in the -[release notes](https://github.com/ceph/ceph-csi/releases/tag/v3.10.0) before +[release notes](https://github.com/ceph/ceph-csi/releases/tag/v3.11.0) before proceeding further.** -git checkout v3.10.0 tag +git checkout v3.11.0 tag ```bash git clone https://github.com/ceph/ceph-csi.git cd ./ceph-csi -git checkout v3.10.0 +git checkout v3.11.0 ``` ```console @@ -222,7 +224,7 @@ For each node: - The pod deletion causes the pods to be restarted and updated automatically on the node. -we have successfully upgraded cephfs csi from v3.9 to v3.10 +we have successfully upgraded cephfs csi from v3.10 to v3.11 ### Upgrading RBD @@ -286,7 +288,7 @@ daemonset.apps/csi-rbdplugin configured service/csi-metrics-rbdplugin configured ``` -we have successfully upgraded RBD csi from v3.9 to v3.10 +we have successfully upgraded RBD csi from v3.10 to v3.11 ### Upgrading NFS @@ -348,7 +350,7 @@ daemonset.apps/csi-nfsplugin configured service/csi-metrics-nfsplugin configured ``` -we have successfully upgraded nfs csi from v3.9 to v3.10 +we have successfully upgraded nfs csi from v3.10 to v3.11 ### CSI Sidecar containers consideration From 76752bd3a3c853da0b462af017d3ec59b962d792 Mon Sep 17 00:00:00 2001 From: Rakshith R Date: Mon, 1 Apr 2024 14:54:28 +0530 Subject: [PATCH 3/4] ci: update pr-commentor rules matrix This commit adds rules for release-v3.11 and removes rules for release-v3.9. Signed-off-by: Rakshith R --- .github/workflows/pull-request-commentor.yaml | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/.github/workflows/pull-request-commentor.yaml b/.github/workflows/pull-request-commentor.yaml index 7c6c6e7491e..09089baea14 100644 --- a/.github/workflows/pull-request-commentor.yaml +++ b/.github/workflows/pull-request-commentor.yaml @@ -18,24 +18,14 @@ jobs: strategy: matrix: - branch: [release-v3.9, release-v3.10, devel] - k8s: ["1.25", "1.26", "1.27", "1.28", "1.29"] + branch: [release-v3.10, release-v3.11, devel] + k8s: ["1.26", "1.27", "1.28", "1.29"] exclude: # the next Ceph-CSI version will not be tested with old Kubernetes - k8s: "1.26" branch: "devel" - - k8s: "1.25" - branch: "devel" - - k8s: "1.25" - branch: "release-v3.10" - - # Ceph-CSI <= 3.9 was released before Kubernetes 1.28 - - k8s: "1.28" - branch: "release-v3.9" # Ceph-CSI <= 3.10 was released before Kubernetes 1.29 - - k8s: "1.29" - branch: "release-v3.9" - k8s: "1.29" branch: "release-v3.10" From 45178c2a905e184f439fbc427609774d27a2c227 Mon Sep 17 00:00:00 2001 From: Rakshith R Date: Mon, 1 Apr 2024 15:21:56 +0530 Subject: [PATCH 4/4] ci: modify mergifyio rules for new release-v3.11 This commit adds support for v3.11 backports and removes support for v3.9 backports. Signed-off-by: Rakshith R --- .mergify.yml | 51 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index ed1bc1a3092..50c2df9cb86 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -68,22 +68,25 @@ queue_rules: - "status-success=ci/centos/upgrade-tests-cephfs" - "status-success=ci/centos/upgrade-tests-rbd" - and: - - base=release-v3.9 + - base=release-v3.11 - "status-success=codespell" - "status-success=multi-arch-build" - "status-success=go-test" - "status-success=golangci-lint" - "status-success=mod-check" - "status-success=lint-extras" - - "status-success=ci/centos/k8s-e2e-external-storage/1.25" - "status-success=ci/centos/k8s-e2e-external-storage/1.26" - "status-success=ci/centos/k8s-e2e-external-storage/1.27" - - "status-success=ci/centos/mini-e2e-helm/k8s-1.25" + - "status-success=ci/centos/k8s-e2e-external-storage/1.28" + - "status-success=ci/centos/k8s-e2e-external-storage/1.29" - "status-success=ci/centos/mini-e2e-helm/k8s-1.26" - "status-success=ci/centos/mini-e2e-helm/k8s-1.27" - - "status-success=ci/centos/mini-e2e/k8s-1.25" + - "status-success=ci/centos/mini-e2e-helm/k8s-1.28" + - "status-success=ci/centos/mini-e2e-helm/k8s-1.29" - "status-success=ci/centos/mini-e2e/k8s-1.26" - "status-success=ci/centos/mini-e2e/k8s-1.27" + - "status-success=ci/centos/mini-e2e/k8s-1.28" + - "status-success=ci/centos/mini-e2e/k8s-1.29" - "status-success=ci/centos/upgrade-tests-cephfs" - "status-success=ci/centos/upgrade-tests-rbd" - and: @@ -162,15 +165,15 @@ pull_request_rules: - "status-success=golangci-lint" - "status-success=mod-check" - "status-success=lint-extras" - - "status-success=ci/centos/k8s-e2e-external-storage/1.25" - "status-success=ci/centos/k8s-e2e-external-storage/1.26" - "status-success=ci/centos/k8s-e2e-external-storage/1.27" - - "status-success=ci/centos/mini-e2e-helm/k8s-1.25" + - "status-success=ci/centos/k8s-e2e-external-storage/1.28" - "status-success=ci/centos/mini-e2e-helm/k8s-1.26" - "status-success=ci/centos/mini-e2e-helm/k8s-1.27" - - "status-success=ci/centos/mini-e2e/k8s-1.25" + - "status-success=ci/centos/mini-e2e-helm/k8s-1.28" - "status-success=ci/centos/mini-e2e/k8s-1.26" - "status-success=ci/centos/mini-e2e/k8s-1.27" + - "status-success=ci/centos/mini-e2e/k8s-1.28" - "status-success=ci/centos/upgrade-tests-cephfs" - "status-success=ci/centos/upgrade-tests-rbd" - "status-success=DCO" @@ -246,7 +249,7 @@ pull_request_rules: - "status-success=ci/centos/upgrade-tests-rbd" - and: - label!=DNM - - base=release-v3.10 + - base=release-v3.11 - "#approved-reviews-by>=2" - "#changes-requested-reviews-by=0" - "approved-reviews-by=@ceph/ceph-csi-contributors" @@ -262,17 +265,20 @@ pull_request_rules: - "status-success=ci/centos/k8s-e2e-external-storage/1.26" - "status-success=ci/centos/k8s-e2e-external-storage/1.27" - "status-success=ci/centos/k8s-e2e-external-storage/1.28" + - "status-success=ci/centos/k8s-e2e-external-storage/1.29" - "status-success=ci/centos/mini-e2e-helm/k8s-1.26" - "status-success=ci/centos/mini-e2e-helm/k8s-1.27" - "status-success=ci/centos/mini-e2e-helm/k8s-1.28" + - "status-success=ci/centos/mini-e2e-helm/k8s-1.29" - "status-success=ci/centos/mini-e2e/k8s-1.26" - "status-success=ci/centos/mini-e2e/k8s-1.27" - "status-success=ci/centos/mini-e2e/k8s-1.28" + - "status-success=ci/centos/mini-e2e/k8s-1.29" - "status-success=ci/centos/upgrade-tests-cephfs" - "status-success=ci/centos/upgrade-tests-rbd" - and: - label!=DNM - - base=release-v3.9 + - base=release-v3.10 - "#approved-reviews-by>=2" - "#changes-requested-reviews-by=0" - "approved-reviews-by=@ceph/ceph-csi-contributors" @@ -284,15 +290,15 @@ pull_request_rules: - "status-success=commitlint" - "status-success=mod-check" - "status-success=lint-extras" - - "status-success=ci/centos/k8s-e2e-external-storage/1.25" - "status-success=ci/centos/k8s-e2e-external-storage/1.26" - "status-success=ci/centos/k8s-e2e-external-storage/1.27" - - "status-success=ci/centos/mini-e2e-helm/k8s-1.25" + - "status-success=ci/centos/k8s-e2e-external-storage/1.28" - "status-success=ci/centos/mini-e2e-helm/k8s-1.26" - "status-success=ci/centos/mini-e2e-helm/k8s-1.27" - - "status-success=ci/centos/mini-e2e/k8s-1.25" + - "status-success=ci/centos/mini-e2e-helm/k8s-1.28" - "status-success=ci/centos/mini-e2e/k8s-1.26" - "status-success=ci/centos/mini-e2e/k8s-1.27" + - "status-success=ci/centos/mini-e2e/k8s-1.28" - "status-success=ci/centos/upgrade-tests-cephfs" - "status-success=ci/centos/upgrade-tests-rbd" - "status-success=DCO" @@ -343,15 +349,18 @@ pull_request_rules: - "status-success=mod-check" - "status-success=lint-extras" - "#changes-requested-reviews-by=0" - - "status-success=ci/centos/k8s-e2e-external-storage/1.25" - "status-success=ci/centos/k8s-e2e-external-storage/1.26" - "status-success=ci/centos/k8s-e2e-external-storage/1.27" - - "status-success=ci/centos/mini-e2e-helm/k8s-1.25" + - "status-success=ci/centos/k8s-e2e-external-storage/1.28" + - "status-success=ci/centos/k8s-e2e-external-storage/1.29" - "status-success=ci/centos/mini-e2e-helm/k8s-1.26" - "status-success=ci/centos/mini-e2e-helm/k8s-1.27" - - "status-success=ci/centos/mini-e2e/k8s-1.25" + - "status-success=ci/centos/mini-e2e-helm/k8s-1.28" + - "status-success=ci/centos/mini-e2e-helm/k8s-1.29" - "status-success=ci/centos/mini-e2e/k8s-1.26" - "status-success=ci/centos/mini-e2e/k8s-1.27" + - "status-success=ci/centos/mini-e2e/k8s-1.28" + - "status-success=ci/centos/mini-e2e/k8s-1.29" - "status-success=ci/centos/upgrade-tests-cephfs" - "status-success=ci/centos/upgrade-tests-rbd" - "status-success=DCO" @@ -385,23 +394,23 @@ pull_request_rules: name: default delete_head_branch: {} - - name: backport patches to release-v3.9 branch + - name: backport patches to release-v3.10 branch conditions: - base=devel - - label=backport-to-release-v3.9 + - label=backport-to-release-v3.10 actions: backport: branches: - - release-v3.9 + - release-v3.10 - - name: backport patches to release-v3.10 branch + - name: backport patches to release-v3.11 branch conditions: - base=devel - - label=backport-to-release-v3.10 + - label=backport-to-release-v3.11 actions: backport: branches: - - release-v3.10 + - release-v3.11 - name: remove outdated approvals on ci/centos conditions: