From fb9403e82065c3a90459bc9f7d7d28e476770374 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 20:39:28 +0000 Subject: [PATCH 1/5] rebase: bump sigs.k8s.io/controller-runtime Bumps the k8s-dependencies group with 1 update: [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime). Updates `sigs.k8s.io/controller-runtime` from 0.18.4 to 0.18.5 - [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases) - [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md) - [Commits](https://github.com/kubernetes-sigs/controller-runtime/compare/v0.18.4...v0.18.5) --- updated-dependencies: - dependency-name: sigs.k8s.io/controller-runtime dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- vendor/modules.txt | 2 +- .../pkg/certwatcher/certwatcher.go | 10 ++++++--- .../controller-runtime/pkg/client/client.go | 22 ++++++++----------- .../pkg/manager/internal.go | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/go.mod b/go.mod index e15e4077d90..e80c322848a 100644 --- a/go.mod +++ b/go.mod @@ -42,7 +42,7 @@ require ( k8s.io/mount-utils v0.30.3 k8s.io/pod-security-admission v0.30.3 k8s.io/utils v0.0.0-20230726121419-3b25d923346b - sigs.k8s.io/controller-runtime v0.18.4 + sigs.k8s.io/controller-runtime v0.18.5 ) require ( diff --git a/go.sum b/go.sum index 8667d0871c2..34d0b90ed47 100644 --- a/go.sum +++ b/go.sum @@ -2671,8 +2671,8 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 h1:/U5vjBbQn3RChhv7P11uhYvCSm5G2GaIi5AIGBS6r4c= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0/go.mod h1:z7+wmGM2dfIiLRfrC6jb5kV2Mq/sK1ZP303cxzkV5Y4= sigs.k8s.io/controller-runtime v0.2.2/go.mod h1:9dyohw3ZtoXQuV1e766PHUn+cmrRCIcBh6XIMFNMZ+I= -sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHvm5BZw= -sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg= +sigs.k8s.io/controller-runtime v0.18.5 h1:nTHio/W+Q4aBlQMgbnC5hZb4IjIidyrizMai9P6n4Rk= +sigs.k8s.io/controller-runtime v0.18.5/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= diff --git a/vendor/modules.txt b/vendor/modules.txt index 24532120f6d..7ef495b0de0 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1741,7 +1741,7 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client/metrics sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/common/metrics sigs.k8s.io/apiserver-network-proxy/konnectivity-client/proto/client -# sigs.k8s.io/controller-runtime v0.18.4 +# sigs.k8s.io/controller-runtime v0.18.5 ## explicit; go 1.22.0 sigs.k8s.io/controller-runtime/pkg/cache sigs.k8s.io/controller-runtime/pkg/cache/internal diff --git a/vendor/sigs.k8s.io/controller-runtime/pkg/certwatcher/certwatcher.go b/vendor/sigs.k8s.io/controller-runtime/pkg/certwatcher/certwatcher.go index 2b9b60d8d77..fe15fc0dd71 100644 --- a/vendor/sigs.k8s.io/controller-runtime/pkg/certwatcher/certwatcher.go +++ b/vendor/sigs.k8s.io/controller-runtime/pkg/certwatcher/certwatcher.go @@ -173,14 +173,14 @@ func (cw *CertWatcher) ReadCertificate() error { func (cw *CertWatcher) handleEvent(event fsnotify.Event) { // Only care about events which may modify the contents of the file. - if !(isWrite(event) || isRemove(event) || isCreate(event)) { + if !(isWrite(event) || isRemove(event) || isCreate(event) || isChmod(event)) { return } log.V(1).Info("certificate event", "event", event) - // If the file was removed, re-add the watch. - if isRemove(event) { + // If the file was removed or renamed, re-add the watch to the previous name + if isRemove(event) || isChmod(event) { if err := cw.watcher.Add(event.Name); err != nil { log.Error(err, "error re-watching file") } @@ -202,3 +202,7 @@ func isCreate(event fsnotify.Event) bool { func isRemove(event fsnotify.Event) bool { return event.Op.Has(fsnotify.Remove) } + +func isChmod(event fsnotify.Event) bool { + return event.Op.Has(fsnotify.Chmod) +} diff --git a/vendor/sigs.k8s.io/controller-runtime/pkg/client/client.go b/vendor/sigs.k8s.io/controller-runtime/pkg/client/client.go index e6c075eb008..451f7b2a1b5 100644 --- a/vendor/sigs.k8s.io/controller-runtime/pkg/client/client.go +++ b/vendor/sigs.k8s.io/controller-runtime/pkg/client/client.go @@ -124,19 +124,15 @@ func newClient(config *rest.Config, options Options) (*client, error) { config.UserAgent = rest.DefaultKubernetesUserAgent() } - if !options.WarningHandler.SuppressWarnings { - // surface warnings - logger := log.Log.WithName("KubeAPIWarningLogger") - // Set a WarningHandler, the default WarningHandler - // is log.KubeAPIWarningLogger with deduplication enabled. - // See log.KubeAPIWarningLoggerOptions for considerations - // regarding deduplication. - config.WarningHandler = log.NewKubeAPIWarningLogger( - logger, - log.KubeAPIWarningLoggerOptions{ - Deduplicate: !options.WarningHandler.AllowDuplicateLogs, - }, - ) + // By default, we de-duplicate and surface warnings. + config.WarningHandler = log.NewKubeAPIWarningLogger( + log.Log.WithName("KubeAPIWarningLogger"), + log.KubeAPIWarningLoggerOptions{ + Deduplicate: !options.WarningHandler.AllowDuplicateLogs, + }, + ) + if options.WarningHandler.SuppressWarnings { + config.WarningHandler = rest.NoWarnings{} } // Use the rest HTTP client for the provided config if unset diff --git a/vendor/sigs.k8s.io/controller-runtime/pkg/manager/internal.go b/vendor/sigs.k8s.io/controller-runtime/pkg/manager/internal.go index 2ce02b105c5..66a2d277f72 100644 --- a/vendor/sigs.k8s.io/controller-runtime/pkg/manager/internal.go +++ b/vendor/sigs.k8s.io/controller-runtime/pkg/manager/internal.go @@ -187,7 +187,7 @@ func (cm *controllerManager) AddMetricsServerExtraHandler(path string, handler h return fmt.Errorf("unable to add new metrics handler because metrics endpoint has already been created") } if cm.metricsServer == nil { - cm.GetLogger().Info("warn: metrics server is currently disabled, registering extra handler %q will be ignored", path) + cm.GetLogger().Info("warn: metrics server is currently disabled, registering extra handler will be ignored", "path", path) return nil } if err := cm.metricsServer.AddExtraHandler(path, handler); err != nil { From dfa565525a4563fd4232decbfd32d27d77a14f7e Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Wed, 14 Aug 2024 12:03:08 +0200 Subject: [PATCH 2/5] ci: remove feature gates Remove the feature gates as they are not required anymore as they are already in beta and few removed in 1.31.0 Signed-off-by: Madhu Rajanna --- scripts/minikube.sh | 9 --------- 1 file changed, 9 deletions(-) diff --git a/scripts/minikube.sh b/scripts/minikube.sh index 32202b757ce..b17f6883798 100755 --- a/scripts/minikube.sh +++ b/scripts/minikube.sh @@ -255,15 +255,6 @@ up) install_podman_wrapper fi - # get kubernetes version we are operating on and accordingly enable feature gates - KUBE_MAJOR=$(kube_version 1) - KUBE_MINOR=$(kube_version 2) - if [ "${KUBE_MAJOR}" -eq 1 ] && [ "${KUBE_MINOR}" -ge 22 ];then - K8S_FEATURE_GATES="${K8S_FEATURE_GATES},ReadWriteOncePod=true" - fi - if [ "${KUBE_MAJOR}" -eq 1 ] && [ "${KUBE_MINOR}" -ge 23 ];then - K8S_FEATURE_GATES="${K8S_FEATURE_GATES},RecoverVolumeExpansionFailure=true" - fi # shellcheck disable=SC2086 ${minikube} start --force --memory="${MEMORY}" --cpus="${CPUS}" -b kubeadm --kubernetes-version="${KUBE_VERSION}" --driver="${VM_DRIVER}" --feature-gates="${K8S_FEATURE_GATES}" --cni="${CNI}" ${EXTRA_CONFIG} --wait-timeout="${MINIKUBE_WAIT_TIMEOUT}" --wait="${MINIKUBE_WAIT}" --delete-on-failure ${DISK_CONFIG} # shellcheck disable=SC2086 From 2241e8e074a446ae9a0a211cbec3955dfeefd668 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Wed, 14 Aug 2024 09:51:56 +0200 Subject: [PATCH 3/5] doc: readme update for 3.12 readme update for 3.12.0 release Signed-off-by: Madhu Rajanna --- README.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 882a0ba9e11..3714f0208b1 100644 --- a/README.md +++ b/README.md @@ -56,10 +56,8 @@ environments. | Ceph CSI Version | Container Orchestrator Name | Version Tested | | -----------------| --------------------------- | -------------------| +| v3.12.0 | Kubernetes | v1.29, v1.30, v1.31| | 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| There is work in progress to make this CO-independent and thus support other orchestration environments (Nomad, Mesos..etc). @@ -130,13 +128,14 @@ in the Kubernetes documentation. | Ceph CSI Release/Branch | Container image name | Image Tag | | ----------------------- | ---------------------------- | --------- | | devel (Branch) | quay.io/cephcsi/cephcsi | canary | +| v3.12.0 (Release) | quay.io/cephcsi/cephcsi | v3.12.0 | | 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 | | Deprecated Ceph CSI Release/Branch | Container image name | Image Tag | | ----------------------- | --------------------------------| --------- | +| 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 | | v3.8.1 (Release) | quay.io/cephcsi/cephcsi | v3.8.1 | | v3.8.0 (Release) | quay.io/cephcsi/cephcsi | v3.8.0 | From 50c202b5f8035abd197fcab78ba8c0d3612197ce Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Wed, 14 Aug 2024 10:40:01 +0200 Subject: [PATCH 4/5] doc: update the upgrade doc updating the upgrade doc to point to 3.12.0 doc for upgrades. Signed-off-by: Madhu Rajanna --- docs/ceph-csi-upgrade.md | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/docs/ceph-csi-upgrade.md b/docs/ceph-csi-upgrade.md index 2cc7675fd3e..7481e70a131 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.10 to v3.11](#upgrading-from-v310-to-v311) + - [Upgrading from v3.11 to v3.12](#upgrading-from-v311-to-v312) - [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.10 to v3.11 +from v3.11 to v3.12 ### Snapshot-controller and snapshot crd @@ -78,9 +78,10 @@ To upgrade from previous releases, refer to the following: - [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 +- [upgrade-from-v3.10-v3.11](https://github.com/ceph/ceph-csi/blob/v3.11.0/docs/ceph-csi-upgrade.md) + to upgrade from cephcsi v3.10 to v3.11 -## Upgrading from v3.10 to v3.11 +## Upgrading from v3.11 to v3.12 **Ceph-csi releases from devel are expressly unsupported.** It is strongly recommended that you use [official @@ -90,19 +91,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.11 except from 3.10 to 3.11.** -For example, upgrading from 3.8 to 3.11 is not recommended. +**Also, we do not recommend any direct upgrades to 3.12 except from 3.11 to 3.12.** +For example, upgrading from 3.10 to 3.12 is not recommended. **Refer to the Breaking Changes Section in the -[release notes](https://github.com/ceph/ceph-csi/releases/tag/v3.11.0) before +[release notes](https://github.com/ceph/ceph-csi/releases/tag/v3.12.0) before proceeding further.** -git checkout v3.11.0 tag +git checkout v3.12.0 tag ```bash git clone https://github.com/ceph/ceph-csi.git cd ./ceph-csi -git checkout v3.11.0 +git checkout v3.12.0 ``` ```console @@ -224,7 +225,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.10 to v3.11 +we have successfully upgraded cephfs csi from v3.11 to v3.12 ### Upgrading RBD @@ -288,7 +289,7 @@ daemonset.apps/csi-rbdplugin configured service/csi-metrics-rbdplugin configured ``` -we have successfully upgraded RBD csi from v3.10 to v3.11 +we have successfully upgraded RBD csi from v3.11 to v3.12 ### Upgrading NFS @@ -350,7 +351,7 @@ daemonset.apps/csi-nfsplugin configured service/csi-metrics-nfsplugin configured ``` -we have successfully upgraded nfs csi from v3.10 to v3.11 +we have successfully upgraded nfs csi from v3.11 to v3.12 ### CSI Sidecar containers consideration From b0751cb06ecc2cab66374fb2f9e490ab7fdabdd7 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Wed, 14 Aug 2024 10:35:42 +0200 Subject: [PATCH 5/5] ci: update rules for 3.12 release updating release for 3.12 release Signed-off-by: Madhu Rajanna --- .github/workflows/pull-request-commentor.yaml | 26 +++--- .mergify.yml | 90 +++++++++---------- 2 files changed, 60 insertions(+), 56 deletions(-) diff --git a/.github/workflows/pull-request-commentor.yaml b/.github/workflows/pull-request-commentor.yaml index 5c13cab33fc..4941651a53f 100644 --- a/.github/workflows/pull-request-commentor.yaml +++ b/.github/workflows/pull-request-commentor.yaml @@ -18,24 +18,28 @@ jobs: strategy: matrix: - branch: [release-v3.10, release-v3.11, devel] - k8s: ["1.26", "1.27", "1.28", "1.29", "1.30"] + branch: [release-v3.11, release-v3.12, devel] + k8s: ["1.26", "1.27", "1.28", "1.29", "1.30", "1.31"] exclude: - # the next Ceph-CSI version will not be tested with old Kubernetes + # Run only last 3 support releases on devel and 3.12 - k8s: "1.26" - branch: "release-v3.11" + branch: "release-v3.12" - k8s: "1.26" branch: "devel" - + - k8s: "1.27" + branch: "release-v3.12" + - k8s: "1.27" + branch: "devel" + - k8s: "1.28" + branch: "release-v3.12" + - k8s: "1.28" + branch: "devel" # Ceph-CSI <= 3.11 was released before Kubernetes 1.30 - k8s: "1.30" branch: "release-v3.11" - - # Ceph-CSI <= 3.10 was released before Kubernetes 1.29 - - k8s: "1.29" - branch: "release-v3.10" - - k8s: "1.30" - branch: "release-v3.10" + # Ceph-CSI <= 3.11 was released before Kubernetes 1.31 + - k8s: "1.31" + branch: "release-v3.11" # watch out, matrix.branch can not be used in this if-statement :-/ if: > diff --git a/.mergify.yml b/.mergify.yml index b5a6236551c..9ab57a17755 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -35,19 +35,19 @@ queue_rules: - "status-success=mod-check" - "status-success=lint-extras" - "status-success=uncommitted-code-check" - - "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.27" - - "status-success=ci/centos/mini-e2e-helm/k8s-1.28" + - "status-success=ci/centos/k8s-e2e-external-storage/1.30" + - "status-success=ci/centos/k8s-e2e-external-storage/1.31" - "status-success=ci/centos/mini-e2e-helm/k8s-1.29" - - "status-success=ci/centos/mini-e2e/k8s-1.27" - - "status-success=ci/centos/mini-e2e/k8s-1.28" + - "status-success=ci/centos/mini-e2e-helm/k8s-1.30" + - "status-success=ci/centos/mini-e2e-helm/k8s-1.31" - "status-success=ci/centos/mini-e2e/k8s-1.29" + - "status-success=ci/centos/mini-e2e/k8s-1.30" + - "status-success=ci/centos/mini-e2e/k8s-1.31" - "status-success=ci/centos/upgrade-tests-cephfs" - "status-success=ci/centos/upgrade-tests-rbd" - and: - - base=release-v3.10 + - base=release-v3.11 - "status-success=codespell" - "status-success=multi-arch-build" - "status-success=go-test" @@ -57,12 +57,15 @@ queue_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: @@ -74,18 +77,15 @@ queue_rules: - "status-success=mod-check" - "status-success=lint-extras" - "status-success=uncommitted-code-check" - - "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/k8s-e2e-external-storage/1.30" - - "status-success=ci/centos/mini-e2e-helm/k8s-1.27" - - "status-success=ci/centos/mini-e2e-helm/k8s-1.28" + - "status-success=ci/centos/k8s-e2e-external-storage/1.31" - "status-success=ci/centos/mini-e2e-helm/k8s-1.29" - "status-success=ci/centos/mini-e2e-helm/k8s-1.30" - - "status-success=ci/centos/mini-e2e/k8s-1.27" - - "status-success=ci/centos/mini-e2e/k8s-1.28" + - "status-success=ci/centos/mini-e2e-helm/k8s-1.31" - "status-success=ci/centos/mini-e2e/k8s-1.29" - "status-success=ci/centos/mini-e2e/k8s-1.30" + - "status-success=ci/centos/mini-e2e/k8s-1.31" - "status-success=ci/centos/upgrade-tests-cephfs" - "status-success=ci/centos/upgrade-tests-rbd" - and: @@ -144,18 +144,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.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/k8s-e2e-external-storage/1.30" - - "status-success=ci/centos/mini-e2e-helm/k8s-1.27" - - "status-success=ci/centos/mini-e2e-helm/k8s-1.28" + - "status-success=ci/centos/k8s-e2e-external-storage/1.31" - "status-success=ci/centos/mini-e2e-helm/k8s-1.29" - "status-success=ci/centos/mini-e2e-helm/k8s-1.30" - - "status-success=ci/centos/mini-e2e/k8s-1.27" - - "status-success=ci/centos/mini-e2e/k8s-1.28" + - "status-success=ci/centos/mini-e2e-helm/k8s-1.31" - "status-success=ci/centos/mini-e2e/k8s-1.29" - "status-success=ci/centos/mini-e2e/k8s-1.30" + - "status-success=ci/centos/mini-e2e/k8s-1.31" - "status-success=ci/centos/upgrade-tests-cephfs" - "status-success=ci/centos/upgrade-tests-rbd" - "status-success=DCO" @@ -190,20 +187,20 @@ pull_request_rules: - "status-success=mod-check" - "status-success=multi-arch-build" - "status-success=uncommitted-code-check" - - "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.27" - - "status-success=ci/centos/mini-e2e-helm/k8s-1.28" + - "status-success=ci/centos/k8s-e2e-external-storage/1.30" + - "status-success=ci/centos/k8s-e2e-external-storage/1.31" - "status-success=ci/centos/mini-e2e-helm/k8s-1.29" - - "status-success=ci/centos/mini-e2e/k8s-1.27" - - "status-success=ci/centos/mini-e2e/k8s-1.28" + - "status-success=ci/centos/mini-e2e-helm/k8s-1.30" + - "status-success=ci/centos/mini-e2e-helm/k8s-1.31" - "status-success=ci/centos/mini-e2e/k8s-1.29" + - "status-success=ci/centos/mini-e2e/k8s-1.30" + - "status-success=ci/centos/mini-e2e/k8s-1.31" - "status-success=ci/centos/upgrade-tests-cephfs" - "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" @@ -218,12 +215,15 @@ 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" - "status-success=DCO" @@ -241,18 +241,15 @@ pull_request_rules: - "status-success=commitlint" - "status-success=mod-check" - "status-success=lint-extras" - - "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/k8s-e2e-external-storage/1.30" - - "status-success=ci/centos/mini-e2e-helm/k8s-1.27" - - "status-success=ci/centos/mini-e2e-helm/k8s-1.28" + - "status-success=ci/centos/k8s-e2e-external-storage/1.31" - "status-success=ci/centos/mini-e2e-helm/k8s-1.29" - "status-success=ci/centos/mini-e2e-helm/k8s-1.30" - - "status-success=ci/centos/mini-e2e/k8s-1.27" - - "status-success=ci/centos/mini-e2e/k8s-1.28" + - "status-success=ci/centos/mini-e2e-helm/k8s-1.31" - "status-success=ci/centos/mini-e2e/k8s-1.29" - "status-success=ci/centos/mini-e2e/k8s-1.30" + - "status-success=ci/centos/mini-e2e/k8s-1.31" - "status-success=ci/centos/upgrade-tests-cephfs" - "status-success=ci/centos/upgrade-tests-rbd" - "status-success=DCO" @@ -278,20 +275,20 @@ pull_request_rules: - "status-success=lint-extras" - "#changes-requested-reviews-by=0" - "status-success=uncommitted-code-check" - - "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.27" - - "status-success=ci/centos/mini-e2e-helm/k8s-1.28" + - "status-success=ci/centos/k8s-e2e-external-storage/1.30" + - "status-success=ci/centos/k8s-e2e-external-storage/1.31" - "status-success=ci/centos/mini-e2e-helm/k8s-1.29" - - "status-success=ci/centos/mini-e2e/k8s-1.27" - - "status-success=ci/centos/mini-e2e/k8s-1.28" + - "status-success=ci/centos/mini-e2e-helm/k8s-1.30" + - "status-success=ci/centos/mini-e2e-helm/k8s-1.31" - "status-success=ci/centos/mini-e2e/k8s-1.29" + - "status-success=ci/centos/mini-e2e/k8s-1.30" + - "status-success=ci/centos/mini-e2e/k8s-1.31" - "status-success=ci/centos/upgrade-tests-cephfs" - "status-success=ci/centos/upgrade-tests-rbd" - "status-success=DCO" - and: - - base=release-v3.10 + - base=release-v3.11 - label!=DNM - label=ready-to-merge - "approved-reviews-by=@ceph/ceph-csi-maintainers" @@ -306,12 +303,15 @@ 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" - "status-success=DCO" @@ -320,23 +320,23 @@ pull_request_rules: name: default delete_head_branch: {} - - 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: backport patches to release-v3.11 branch + - name: backport patches to release-v3.12 branch conditions: - base=devel - - label=backport-to-release-v3.11 + - label=backport-to-release-v3.12 actions: backport: branches: - - release-v3.11 + - release-v3.12 - name: remove outdated approvals on ci/centos conditions: