Merge commit '80903df9848599a7f8c5725695cfc3094db26de8' into sync_us-…

…-master

Signed-off-by: Ceph Jenkins <ceph-jenkins@redhat.com>

.github/workflows/canary-integration-suite.yml

@@ -31,5 +31,5 @@ jobs:
   canary-tests:
     uses: ./.github/workflows/canary-integration-test.yml
     with:
-      ceph_images: '["quay.io/ceph/ceph:v18"]'
+      ceph_images: '["quay.io/ceph/ceph:v19"]'
     secrets: inherit

.github/workflows/canary-integration-test.yml

@@ -5,7 +5,7 @@ on:
     inputs:
       ceph_images:
         description: "JSON list of Ceph images for creating Ceph cluster"
-        default: '["quay.io/ceph/ceph:v18"]'
+        default: '["quay.io/ceph/ceph:v19"]'
         type: string
 
 defaults:

.github/workflows/canary-test-config/action.yaml

@@ -12,7 +12,7 @@ runs:
     - name: Setup Minikube
       shell: bash --noprofile --norc -eo pipefail -x {0}
       run: |
-        tests/scripts/github-action-helper.sh install_minikube_with_none_driver v1.31.0
+        tests/scripts/github-action-helper.sh install_minikube_with_none_driver v1.32.0
 
     - name: install deps
       shell: bash --noprofile --norc -eo pipefail -x {0}

.github/workflows/codespell.yaml

@@ -57,4 +57,4 @@ jobs:
         with:
           fetch-depth: 0
       - name: misspell
-        uses: reviewdog/action-misspell@ef8b22c1cca06c8d306fc6be302c3dab0f6ca12f # v1.23.0
+        uses: reviewdog/action-misspell@18ffb61effb93b47e332f185216be7e49592e7e1 # v1.26.1

.github/workflows/daily-nightly-jobs.yml

@@ -356,5 +356,5 @@ jobs:
     if: github.repository == 'rook/rook'
     uses: ./.github/workflows/canary-integration-test.yml
     with:
-      ceph_images: '["quay.io/ceph/ceph:v18", "quay.io/ceph/daemon-base:latest-main-devel", "quay.io/ceph/daemon-base:latest-reef-devel", "quay.io/ceph/daemon-base:latest-squid-devel"]'
+      ceph_images: '["quay.io/ceph/ceph:v18", "quay.io/ceph/ceph:v19", "quay.ceph.io/ceph-ci/ceph:main", "quay.ceph.io/ceph-ci/ceph:reef", "quay.ceph.io/ceph-ci/ceph:squid"]'
     secrets: inherit

.github/workflows/integration-test-helm-suite.yaml

@@ -28,7 +28,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes-versions: ["v1.27.16", "v1.31.0"]
+        kubernetes-versions: ["v1.27.16", "v1.32.0"]
     steps:
       - name: checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.github/workflows/integration-test-keystone-auth-suite.yaml

@@ -28,7 +28,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes-versions: ["v1.27.16", "v1.31.0"]
+        kubernetes-versions: ["v1.27.16", "v1.32.0"]
     steps:
       - name: checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.github/workflows/integration-test-mgr-suite.yaml

@@ -27,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes-versions: ["v1.31.0"]
+        kubernetes-versions: ["v1.32.0"]
     steps:
       - name: checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.github/workflows/integration-test-multi-cluster-suite.yaml

@@ -28,7 +28,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes-versions: ["v1.31.0"]
+        kubernetes-versions: ["v1.32.0"]
     steps:
       - name: checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.github/workflows/integration-test-object-suite.yaml

@@ -28,7 +28,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes-versions: ["v1.27.16", "v1.31.0"]
+        kubernetes-versions: ["v1.27.16", "v1.32.0"]
     steps:
       - name: checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.github/workflows/integration-test-smoke-suite.yaml

@@ -28,7 +28,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes-versions: ["v1.27.16", "v1.31.0"]
+        kubernetes-versions: ["v1.27.16", "v1.32.0"]
     steps:
       - name: checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.github/workflows/integration-test-upgrade-suite.yaml

@@ -28,7 +28,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes-versions: ["v1.27.16", "v1.31.0"]
+        kubernetes-versions: ["v1.27.16", "v1.32.0"]
     steps:
       - name: checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -73,7 +73,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes-versions: ["v1.27.16", "v1.31.0"]
+        kubernetes-versions: ["v1.27.16", "v1.32.0"]
     steps:
       - name: checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.github/workflows/integration-tests-on-release.yaml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes-versions: ["v1.27.16", "v1.28.12", "v1.29.7", "v1.31.0"]
+        kubernetes-versions: ["v1.27.16", "v1.28.15", "v1.30.8", "v1.32.0"]
     steps:
       - name: checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -61,7 +61,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes-versions: ["v1.27.16", "v1.28.12", "v1.29.7", "v1.31.0"]
+        kubernetes-versions: ["v1.27.16", "v1.28.15", "v1.30.8", "v1.32.0"]
     steps:
       - name: checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -102,7 +102,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes-versions: ["v1.27.16", "v1.28.12", "v1.29.7", "v1.31.0"]
+        kubernetes-versions: ["v1.27.16", "v1.28.15", "v1.30.8", "v1.32.0"]
     steps:
       - name: checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -140,7 +140,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes-versions: ["v1.27.16", "v1.28.12", "v1.29.7", "v1.31.0"]
+        kubernetes-versions: ["v1.27.16", "v1.28.15", "v1.30.8", "v1.32.0"]
     steps:
       - name: checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -178,7 +178,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes-versions: ["v1.27.16", "v1.28.12", "v1.29.7", "v1.31.0"]
+        kubernetes-versions: ["v1.27.16", "v1.28.15", "v1.30.8", "v1.32.0"]
     steps:
       - name: checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -219,7 +219,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes-versions: ["v1.27.16", "v1.31.0"]
+        kubernetes-versions: ["v1.27.16", "v1.32.0"]
     steps:
       - name: checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.github/workflows/scorecards.yml

@@ -64,6 +64,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+        uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
         with:
           sarif_file: results.sarif

.mergify.yml

@@ -207,38 +207,37 @@ pull_request_rules:
       - "check-success=crds-gen"
       - "check-success=docs-check"
       - "check-success=pylint"
-      - "check-success=canary-tests / canary (quay.io/ceph/ceph:v18)"
-      - "check-success=canary-tests / raw-disk-with-object (quay.io/ceph/ceph:v18)"
-      - "check-success=canary-tests / two-osds-in-device (quay.io/ceph/ceph:v18)"
-      - "check-success=canary-tests / osd-with-metadata-partition-device (quay.io/ceph/ceph:v18)"
-      - "check-success=canary-tests / osd-with-metadata-device (quay.io/ceph/ceph:v18)"
-      - "check-success=canary-tests / encryption (quay.io/ceph/ceph:v18)"
-      - "check-success=canary-tests / lvm (quay.io/ceph/ceph:v18)"
-      - "check-success=canary-tests / pvc (quay.io/ceph/ceph:v18)"
-      - "check-success=canary-tests / pvc-db (quay.io/ceph/ceph:v18)"
-      - "check-success=canary-tests / pvc-db-wal (quay.io/ceph/ceph:v18)"
-      - "check-success=canary-tests / encryption-pvc (quay.io/ceph/ceph:v18)"
-      - "check-success=canary-tests / encryption-pvc-db (quay.io/ceph/ceph:v18)"
-      - "check-success=canary-tests / encryption-pvc-db-wal (quay.io/ceph/ceph:v18)"
-      - "check-success=canary-tests / encryption-pvc-kms-vault-token-auth (quay.io/ceph/ceph:v18)"
-      - "check-success=canary-tests / encryption-pvc-kms-vault-k8s-auth (quay.io/ceph/ceph:v18)"
-      - "check-success=canary-tests / lvm-pvc (quay.io/ceph/ceph:v18)"
-      - "check-success=canary-tests / multi-cluster-mirroring (quay.io/ceph/ceph:v18)"
-      - "check-success=canary-tests / rgw-multisite-testing (quay.io/ceph/ceph:v18)"
-      - "check-success=canary-tests / encryption-pvc-kms-ibm-kp (quay.io/ceph/ceph:v18)"
-      - "check-success=canary-tests / multus-public-and-cluster (quay.io/ceph/ceph:v18)"
-      - "check-success=canary-tests / csi-hostnetwork-disabled (quay.io/ceph/ceph:v18)"
+      - "check-success=canary-tests / canary (quay.io/ceph/ceph:v19)"
+      - "check-success=canary-tests / raw-disk-with-object (quay.io/ceph/ceph:v19)"
+      - "check-success=canary-tests / two-osds-in-device (quay.io/ceph/ceph:v19)"
+      - "check-success=canary-tests / osd-with-metadata-partition-device (quay.io/ceph/ceph:v19)"
+      - "check-success=canary-tests / osd-with-metadata-device (quay.io/ceph/ceph:v19)"
+      - "check-success=canary-tests / encryption (quay.io/ceph/ceph:v19)"
+      - "check-success=canary-tests / lvm (quay.io/ceph/ceph:v19)"
+      - "check-success=canary-tests / pvc (quay.io/ceph/ceph:v19)"
+      - "check-success=canary-tests / pvc-db (quay.io/ceph/ceph:v19)"
+      - "check-success=canary-tests / pvc-db-wal (quay.io/ceph/ceph:v19)"
+      - "check-success=canary-tests / encryption-pvc (quay.io/ceph/ceph:v19)"
+      - "check-success=canary-tests / encryption-pvc-db (quay.io/ceph/ceph:v19)"
+      - "check-success=canary-tests / encryption-pvc-db-wal (quay.io/ceph/ceph:v19)"
+      - "check-success=canary-tests / encryption-pvc-kms-vault-token-auth (quay.io/ceph/ceph:v19)"
+      - "check-success=canary-tests / encryption-pvc-kms-vault-k8s-auth (quay.io/ceph/ceph:v19)"
+      - "check-success=canary-tests / lvm-pvc (quay.io/ceph/ceph:v19)"
+      - "check-success=canary-tests / multi-cluster-mirroring (quay.io/ceph/ceph:v19)"
+      - "check-success=canary-tests / rgw-multisite-testing (quay.io/ceph/ceph:v19)"
+      - "check-success=canary-tests / encryption-pvc-kms-ibm-kp (quay.io/ceph/ceph:v19)"
+      - "check-success=canary-tests / multus-public-and-cluster (quay.io/ceph/ceph:v19)"
       - "check-success=TestCephSmokeSuite (v1.27.16)"
-      - "check-success=TestCephSmokeSuite (v1.31.0)"
+      - "check-success=TestCephSmokeSuite (v1.32.0)"
       - "check-success=TestCephHelmSuite (v1.27.16)"
-      - "check-success=TestCephHelmSuite (v1.31.0)"
-      - "check-success=TestCephMultiClusterDeploySuite (v1.31.0)"
+      - "check-success=TestCephHelmSuite (v1.32.0)"
+      - "check-success=TestCephMultiClusterDeploySuite (v1.32.0)"
       - "check-success=TestCephObjectSuite (v1.27.16)"
-      - "check-success=TestCephObjectSuite (v1.31.0)"
+      - "check-success=TestCephObjectSuite (v1.32.0)"
       - "check-success=TestCephUpgradeSuite (v1.27.16)"
-      - "check-success=TestCephUpgradeSuite (v1.31.0)"
+      - "check-success=TestCephUpgradeSuite (v1.32.0)"
       - "check-success=TestHelmUpgradeSuite (v1.27.16)"
-      - "check-success=TestHelmUpgradeSuite (v1.31.0)"
+      - "check-success=TestHelmUpgradeSuite (v1.32.0)"
     actions:
       merge:
         method: merge

CODE-OWNERS

@@ -14,3 +14,4 @@ approvers:
 reviewers:
 - Madhu-1
 - parth-gr
+- arttor

Documentation/CRDs/Cluster/ceph-cluster-crd.md

@@ -26,7 +26,7 @@ Settings can be specified at the global level to apply to the cluster as a whole
 * `external`:
     * `enable`: if `true`, the cluster will not be managed by Rook but via an external entity. This mode is intended to connect to an existing cluster. In this case, Rook will only consume the external cluster. However, Rook will be able to deploy various daemons in Kubernetes such as object gateways, mds and nfs if an image is provided and will refuse otherwise. If this setting is enabled **all** the other options will be ignored except `cephVersion.image` and `dataDirHostPath`. See [external cluster configuration](external-cluster/external-cluster.md). If `cephVersion.image` is left blank, Rook will refuse the creation of extra CRs like object, file and nfs.
 * `cephVersion`: The version information for launching the ceph daemons.
-    * `image`: The image used for running the ceph daemons. For example, `quay.io/ceph/ceph:v18.2.4`. For more details read the [container images section](#ceph-container-images).
+    * `image`: The image used for running the ceph daemons. For example, `quay.io/ceph/ceph:v19.2.0`. For more details read the [container images section](#ceph-container-images).
         For the latest ceph images, see the [Ceph DockerHub](https://hub.docker.com/r/ceph/ceph/tags/).
         To ensure a consistent version of the image is running across all nodes in the cluster, it is recommended to use a very specific image version.
         Tags also exist that would give the latest version, but they are only recommended for test environments. For example, the tag `v19` will be updated each time a new Squid build is released.
@@ -431,7 +431,7 @@ metadata:
   namespace: rook-ceph
 spec:
   cephVersion:
-    image: quay.io/ceph/ceph:v18.2.4
+    image: quay.io/ceph/ceph:v19.2.0
   dataDirHostPath: /var/lib/rook
   mon:
     count: 3
@@ -538,7 +538,7 @@ metadata:
   namespace: rook-ceph
 spec:
   cephVersion:
-    image: quay.io/ceph/ceph:v18.2.4
+    image: quay.io/ceph/ceph:v19.2.0
   dataDirHostPath: /var/lib/rook
   mon:
     count: 3
@@ -668,7 +668,7 @@ kubectl -n rook-ceph get CephCluster -o yaml
       deviceClasses:
       - name: hdd
     version:
-      image: quay.io/ceph/ceph:v18.2.4
+      image: quay.io/ceph/ceph:v19.2.0
       version: 16.2.6-0
     conditions:
     - lastHeartbeatTime: "2021-03-02T21:22:11Z"

Documentation/CRDs/Cluster/host-cluster.md

@@ -22,7 +22,7 @@ metadata:
 spec:
   cephVersion:
     # see the "Cluster Settings" section below for more details on which image of ceph to run
-    image: quay.io/ceph/ceph:v18.2.4
+    image: quay.io/ceph/ceph:v19.2.0
   dataDirHostPath: /var/lib/rook
   mon:
     count: 3
@@ -49,7 +49,7 @@ metadata:
   namespace: rook-ceph
 spec:
   cephVersion:
-    image: quay.io/ceph/ceph:v18.2.4
+    image: quay.io/ceph/ceph:v19.2.0
   dataDirHostPath: /var/lib/rook
   mon:
     count: 3
@@ -101,7 +101,7 @@ metadata:
   namespace: rook-ceph
 spec:
   cephVersion:
-    image: quay.io/ceph/ceph:v18.2.4
+    image: quay.io/ceph/ceph:v19.2.0
   dataDirHostPath: /var/lib/rook
   mon:
     count: 3

Documentation/CRDs/Cluster/pvc-cluster.md

@@ -18,7 +18,7 @@ metadata:
   namespace: rook-ceph
 spec:
   cephVersion:
-    image: quay.io/ceph/ceph:v18.2.4
+    image: quay.io/ceph/ceph:v19.2.0
   dataDirHostPath: /var/lib/rook
   mon:
     count: 3
@@ -72,7 +72,7 @@ spec:
           requests:
             storage: 10Gi
   cephVersion:
-    image: quay.io/ceph/ceph:v18.2.4
+    image: quay.io/ceph/ceph:v19.2.0
     allowUnsupported: false
   dashboard:
     enabled: true
@@ -128,7 +128,7 @@ metadata:
   namespace: rook-ceph
 spec:
   cephVersion:
-    image: quay.io/ceph/ceph:v18.2.4
+    image: quay.io/ceph/ceph:v19.2.0
   dataDirHostPath: /var/lib/rook
   mon:
     count: 3

Documentation/CRDs/Cluster/stretch-cluster.md

@@ -34,7 +34,7 @@ spec:
       - name: b
       - name: c
   cephVersion:
-    image: quay.io/ceph/ceph:v18.2.4
+    image: quay.io/ceph/ceph:v19.2.0
     allowUnsupported: true
   # Either storageClassDeviceSets or the storage section can be specified for creating OSDs.
   # This example uses all devices for simplicity.

Documentation/CRDs/Object-Storage/ceph-object-store-crd.md

@@ -138,11 +138,26 @@ The following options can be configured in the `keystone`-section:
 * `tokenCacheSize`: specifies the maximum number of entries in each Keystone token cache.
 * `url`: The url of the Keystone API endpoint to use.
 
-The protocols section is divided into two parts:
+### Protocols Settings
 
+The protocols section is divided into three parts:
+
+- `enableAPIs` - list of APIs to be enabled in RGW instance. If no values set, all APIs will be enabled. Possible values: `s3, s3website, swift, swift_auth, admin, sts, iam, notifications`. Represents RGW [rgw_enable_apis](https://docs.ceph.com/en/reef/radosgw/config-ref/#confval-rgw_enable_apis) config parameter.
 - a section to configure S3
 - a section to configure swift
 
+```yaml
+spec:
+  [...]
+  protocols:
+    enableAPIs: []
+    swift:
+      # a section to configure swift
+    s3:
+      # a section to configure s3
+  [...]
+```
+
 #### protocols/S3 settings
 
 In the `s3` section of the `protocols` section the following options can be configured:

Documentation/CRDs/Shared-Filesystem/ceph-filesystem-crd.md

@@ -111,8 +111,10 @@ Also see an example in the [`storageclass-ec.yaml`](https://github.com/rook/rook
 The pools allow all of the settings defined in the Pool CRD spec. For more details, see the [Pool CRD](../Block-Storage/ceph-block-pool-crd.md) settings. In the example above, there must be at least three hosts (size 3) and at least eight devices (6 data + 2 coding chunks) in the cluster.
 
 * `metadataPool`: The settings used to create the filesystem metadata pool. Must use replication.
+    * `name`: (optional) Override the default generated name of the metadata pool.
 * `dataPools`: The settings to create the filesystem data pools. Optionally (and we highly recommend), a pool name can be specified with the `name` field to override the default generated name; see more below. If multiple pools are specified, Rook will add the pools to the filesystem. Assigning users or files to a pool is left as an exercise for the reader with the [CephFS documentation](http://docs.ceph.com/docs/master/cephfs/file-layouts/). The data pools can use replication or erasure coding. If erasure coding pools are specified, the cluster must be running with bluestore enabled on the OSDs.
-    * `name`: (optional, and highly recommended) Override the default generated name of the pool. The final pool name will consist of the filesystem name and pool name, e.g., `<fsName>-<poolName>`. We highly recommend to specify `name` to prevent issues that can arise from modifying the spec in a way that causes Rook to lose the original pool ordering.
+    * `name`: (optional, and highly recommended) Override the default generated name of the pool. We highly recommend to specify `name` to prevent issues that can arise from modifying the spec in a way that causes Rook to lose the original pool ordering.
+* `preservePoolNames`: Preserve pool names as specified.
 * `preserveFilesystemOnDelete`: If it is set to 'true' the filesystem will remain when the
     CephFilesystem resource is deleted. This is a security measure to avoid loss of data if the
     CephFilesystem resource is deleted accidentally. The default value is 'false'. This option
@@ -121,6 +123,10 @@ The pools allow all of the settings defined in the Pool CRD spec. For more detai
     `preserveFilesystemOnDelete`. For backwards compatibility and upgradeability, if this is set to
     'true', Rook will treat `preserveFilesystemOnDelete` as being set to 'true'.
 
+### Generated Pool Names
+
+Both `metadataPool` and `dataPools` support defining names as required. The final pool name will consist of the filesystem name and pool name, e.g., `<fsName>-<poolName>` or `<fsName>-metadata` for `metadataPool`. For more granular configuration you may want to set `preservePoolNames` to `true` in `pools` to disable generation of names. In that case all pool names defined are used as given.
+
 ## Metadata Server Settings
 
 The metadata server settings correspond to the MDS daemon settings.