From 788b6629ec1e700a523c7c590381eebf7efefc04 Mon Sep 17 00:00:00 2001 From: Rakshith R Date: Wed, 29 Nov 2023 16:19:43 +0530 Subject: [PATCH 1/6] ci: update pr-commentor rules matrix This commit adds rules for release-v3.10 and removes rules for release-v3.8. Signed-off-by: Rakshith R --- .github/workflows/pull-request-commentor.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pull-request-commentor.yaml b/.github/workflows/pull-request-commentor.yaml index 1b17150b2d0..6f681412474 100644 --- a/.github/workflows/pull-request-commentor.yaml +++ b/.github/workflows/pull-request-commentor.yaml @@ -18,16 +18,16 @@ jobs: strategy: matrix: - branch: [release-v3.8, release-v3.9, devel] + branch: [release-v3.9, release-v3.10, devel] k8s: ["1.25", "1.26", "1.27", "1.28"] exclude: # the next Ceph-CSI version will not be tested with old Kubernetes - 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.8" - k8s: "1.28" branch: "release-v3.9" From 58b74a29e48294003684e4b83ba558ba42d0ae31 Mon Sep 17 00:00:00 2001 From: Rakshith R Date: Wed, 29 Nov 2023 16:21:35 +0530 Subject: [PATCH 2/6] ci: modify mergifyio rules for new release-v3.10 This commit adds support for v3.10 backports and removes support for v3.8 backports. Signed-off-by: Rakshith R --- .mergify.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 79ebed0d8f3..183dc599435 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -284,23 +284,23 @@ pull_request_rules: name: default delete_head_branch: {} - - name: backport patches to release-v3.8 branch + - name: backport patches to release-v3.9 branch conditions: - base=devel - - label=backport-to-release-v3.8 + - label=backport-to-release-v3.9 actions: backport: branches: - - release-v3.8 + - release-v3.9 - - 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: remove outdated approvals on ci/centos conditions: From 7f8880fa746844576e0c57fa5ecdeea8b2c7e6de Mon Sep 17 00:00:00 2001 From: Rakshith R Date: Wed, 29 Nov 2023 16:41:56 +0530 Subject: [PATCH 3/6] doc: reset PendingReleaseNotes.md This commit resets PendingReleaseNotes.md and points it to 3.11 release. Signed-off-by: Rakshith R --- PendingReleaseNotes.md | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/PendingReleaseNotes.md b/PendingReleaseNotes.md index f93d0a89fbc..7b9f1dd836b 100644 --- a/PendingReleaseNotes.md +++ b/PendingReleaseNotes.md @@ -1,20 +1,7 @@ -# v3.10 Pending Release Notes +# v3.11 Pending Release Notes ## 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) From bab48565134b832bc87fb0e12bf9735ce7c2215d Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Thu, 30 Nov 2023 10:27:23 +0100 Subject: [PATCH 4/6] ci: allow Mergify to merge PRs that modify the mergify configuration The new `allow_merging_configuration_change` option can be enabled to > Allow merging Mergify configuration change. Which is useful for a more automated process when preparing for a release. See-also: https://docs.mergify.com/workflow/actions/merge/#parameters Signed-off-by: Niels de Vos --- .mergify.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.mergify.yml b/.mergify.yml index 183dc599435..6aed0ccc17a 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -16,6 +16,11 @@ defaults: # Use ceph-csi-bot for rebasing, not the account of the PR owner. # bot_account: ceph-csi-bot + # by default Mergify requires manual merging of PRs that modify its own + # configuration (this file), allowing this makes it easier to prepare for + # releases (new branches added here) + allow_merging_configuration_change: true + queue_rules: - name: default conditions: From c8b542e49a7e80a0d0c7a00e243de2742f1962b9 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Thu, 30 Nov 2023 21:14:27 +0100 Subject: [PATCH 5/6] ci: the release-v3.10 branch needs Kubernetes 1.28 jobs With Ceph-CSI v3.10 we do not test Kubernetes 1.25 anymore, and we expect Kubernetes 1.28 to be used. Signed-off-by: Niels de Vos --- .mergify.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.mergify.yml b/.mergify.yml index 6aed0ccc17a..a698329d804 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -34,6 +34,25 @@ queue_rules: - "status-success=golangci-lint" - "status-success=mod-check" - "status-success=lint-extras" + - "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/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/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" + - and: + - base=release-v3.9 + - "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" From a57953313af9b867264d2165ec9268561f5dcb4c Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Fri, 1 Dec 2023 10:14:41 +0100 Subject: [PATCH 6/6] ci: use regex comparing `~=` for `release-v*` branch checking It seems that `base=release-v*` does not match the `release-v3.10` branch for some reason. Maybe a Mergify update requires stricter checking of strings, and only allows the `~=` operator for regular expressions now? Regular expressions like `base~=^(devel)|(release-.+)$` seem to match for `release-3.10`, so let's use that notation everywhere. Signed-off-by: Niels de Vos --- .mergify.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index a698329d804..ac5fb46b4a8 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -27,7 +27,7 @@ queue_rules: # Conditions to get out of the queue (= merged) - or: - and: - - base=release-v* + - base~=^(release-.+)$ - "status-success=codespell" - "status-success=multi-arch-build" - "status-success=go-test" @@ -129,7 +129,7 @@ pull_request_rules: - and: - author=dependabot[bot] - label!=DNM - - base=release-v* + - base~=^(release-.+)$ - "#approved-reviews-by>=2" - "#changes-requested-reviews-by=0" - "approved-reviews-by=@ceph/ceph-csi-contributors" @@ -195,7 +195,7 @@ pull_request_rules: - or: - and: - label!=DNM - - base=release-v* + - base~=^(release-.+)$ - "#approved-reviews-by>=2" - "#changes-requested-reviews-by=0" - "approved-reviews-by=@ceph/ceph-csi-contributors" @@ -254,7 +254,7 @@ pull_request_rules: conditions: - or: - and: - - base=release-v* + - base~=^(release-.+)$ - label!=DNM - label=ready-to-merge - "approved-reviews-by=@ceph/ceph-csi-maintainers"