Merge pull request #359 from red-hat-storage/sync_us--devel

Syncing latest changes from upstream devel for ceph-csi

.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: >

.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:

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    |

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
 

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 (

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=