Skip to content

Commit 3573d45

Browse files
authored
Merge pull request #806 from Nikhil-Ladha/sync_us-manual
Manual sync of upstream to downstream
2 parents e04b504 + e111f87 commit 3573d45

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+966
-576
lines changed

.github/workflows/commitlint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3232
with:
3333
fetch-depth: 0
34-
- uses: wagoid/commitlint-github-action@0184f5a228ee06430bb9e67d65f73a1a6767496a # v6.2.0
34+
- uses: wagoid/commitlint-github-action@b948419dd99f3fd78a6548d48f94e3df7f6bf3ed # v6.2.1
3535
with:
3636
configFile: "./.commitlintrc.json"
3737
helpURL: https://rook.io/docs/rook/latest/Contributing/development-flow/#commit-structure

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ jobs:
145145
tests/scripts/collect-logs.sh
146146
147147
- name: Artifact
148-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
148+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
149149
if: failure()
150150
with:
151151
name: ceph-smoke-suite-reef-artifact
@@ -185,7 +185,7 @@ jobs:
185185
tests/scripts/collect-logs.sh
186186
187187
- name: Artifact
188-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
188+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
189189
if: failure()
190190
with:
191191
name: ceph-smoke-suite-squid-artifact
@@ -225,7 +225,7 @@ jobs:
225225
tests/scripts/collect-logs.sh
226226
227227
- name: Artifact
228-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
228+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
229229
if: failure()
230230
with:
231231
name: ceph-smoke-suite-master-artifact
@@ -265,7 +265,7 @@ jobs:
265265
tests/scripts/collect-logs.sh
266266
267267
- name: Artifact
268-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
268+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
269269
if: failure()
270270
with:
271271
name: ceph-object-suite-master-artifact
@@ -305,7 +305,7 @@ jobs:
305305
tests/scripts/collect-logs.sh
306306
307307
- name: Artifact
308-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
308+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
309309
if: failure()
310310
with:
311311
name: ceph-upgrade-suite-squid-artifact
@@ -346,7 +346,7 @@ jobs:
346346
tests/scripts/collect-logs.sh
347347
348348
- name: Artifact
349-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
349+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
350350
if: failure()
351351
with:
352352
name: ceph-upgrade-suite-reef-artifact

.github/workflows/docs-check.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ jobs:
4242
Documentation/**/*.md
4343
!Documentation/Helm-Charts
4444
45-
- name: Check helm-docs
46-
run: make check.helm-docs
4745
- name: Check docs
48-
run: make check.docs
46+
run: |
47+
make gen.docs
48+
tests/scripts/validate_modified_files.sh docs
4949
- name: Install mkdocs and dependencies
5050
run: cd build/release/ && make deps.docs
5151

.github/workflows/golangci-lint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
with:
3232
go-version: "1.23"
3333
- name: golangci-lint
34-
uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
34+
uses: golangci/golangci-lint-action@ec5d18412c0aeab7936cb16880d708ba2a64e1ae # v6.2.0
3535
with:
3636
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
3737
version: v1.62

.github/workflows/helm-lint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
python-version: 3.9
4141

4242
- name: Set up chart-testing
43-
uses: helm/chart-testing-action@e6669bcd63d7cb57cb4380c33043eebe5d111992 # v2.6.1
43+
uses: helm/chart-testing-action@0d28d3144d3a25ea2cc349d6e59901c4ff469b3b # v2.7.0
4444

4545
- name: Run chart-testing (lint)
4646
run: ct lint --charts=./deploy/charts/rook-ceph --validate-yaml=false --validate-maintainers=false

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
tests/scripts/collect-logs.sh
6666
6767
- name: Artifact
68-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
68+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
6969
if: failure()
7070
with:
7171
name: ceph-helm-suite-artifact-${{ matrix.kubernetes-versions }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
tests/scripts/collect-logs.sh
6464
6565
- name: Artifact
66-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
66+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
6767
if: failure()
6868
with:
6969
name: ceph-keystone-auth-suite-artifact-${{ matrix.kubernetes-versions }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
tests/scripts/collect-logs.sh
6161
6262
- name: Artifact
63-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
63+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
6464
if: failure()
6565
with:
6666
name: ceph-mgr-suite-artifact-${{ matrix.kubernetes-versions }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
CLUSTER_NAMESPACE="multi-external" tests/scripts/collect-logs.sh
6565
6666
- name: Artifact
67-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
67+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
6868
if: failure()
6969
with:
7070
name: ceph-multi-cluster-deploy-suite-artifact-${{ matrix.kubernetes-versions }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
tests/scripts/collect-logs.sh
6262
6363
- name: Artifact
64-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
64+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
6565
if: failure()
6666
with:
6767
name: ceph-object-suite-artifact-${{ matrix.kubernetes-versions }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
tests/scripts/collect-logs.sh
6262
6363
- name: Artifact
64-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
64+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
6565
if: failure()
6666
with:
6767
name: ceph-smoke-suite-artifact-${{ matrix.kubernetes-versions }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
tests/scripts/collect-logs.sh
6262
6363
- name: Artifact
64-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
64+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
6565
if: failure()
6666
with:
6767
name: ceph-upgrade-suite-artifact-${{ matrix.kubernetes-versions }}
@@ -109,7 +109,7 @@ jobs:
109109
tests/scripts/collect-logs.sh
110110
111111
- name: Artifact
112-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
112+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
113113
if: failure()
114114
with:
115115
name: ceph-upgrade-helm-suite-artifact-${{ matrix.kubernetes-versions }}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
tests/scripts/collect-logs.sh
5151
5252
- name: Artifact
53-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
53+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
5454
if: failure()
5555
with:
5656
name: ceph-helm-suite-artifact-${{ matrix.kubernetes-versions }}
@@ -91,7 +91,7 @@ jobs:
9191
CLUSTER_NAMESPACE="multi-external" tests/scripts/collect-logs.sh
9292
9393
- name: Artifact
94-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
94+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
9595
if: failure()
9696
with:
9797
name: ceph-multi-cluster-deploy-suite-artifact-${{ matrix.kubernetes-versions }}
@@ -129,7 +129,7 @@ jobs:
129129
tests/scripts/collect-logs.sh
130130
131131
- name: Artifact
132-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
132+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
133133
if: failure()
134134
with:
135135
name: ceph-smoke-suite-artifact-${{ matrix.kubernetes-versions }}
@@ -167,7 +167,7 @@ jobs:
167167
tests/scripts/collect-logs.sh
168168
169169
- name: Artifact
170-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
170+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
171171
if: failure()
172172
with:
173173
name: ceph-upgrade-suite-artifact-${{ matrix.kubernetes-versions }}
@@ -208,7 +208,7 @@ jobs:
208208
tests/scripts/collect-logs.sh
209209
210210
- name: Artifact
211-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
211+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
212212
if: failure()
213213
with:
214214
name: ceph-upgrade-suite-artifact-${{ matrix.kubernetes-versions }}
@@ -246,7 +246,7 @@ jobs:
246246
tests/scripts/collect-logs.sh
247247
248248
- name: Artifact
249-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
249+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
250250
if: failure()
251251
with:
252252
name: ceph-object-suite-artifact-${{ matrix.kubernetes-versions }}

.github/workflows/linters.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
run: pip install yamllint
3737

3838
- name: Lint YAML files
39-
run: yamllint -c .github/workflows/.yamllint deploy/examples/ --no-warnings
39+
run: make yamllint
4040

4141
pylint:
4242
runs-on: ubuntu-latest
@@ -58,7 +58,7 @@ jobs:
5858
pip install pygit2
5959
6060
- name: Lint Python files
61-
run: pylint $(git ls-files '*.py') -E
61+
run: make pylint
6262

6363
- name: Setup black for py
6464
uses: psf/black@1b2427a2b785cc4aac97c19bb4b9a0de063f9547 # stable

.github/workflows/multus.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
go-version: "1.23"
4747

4848
- name: Create KinD Cluster
49-
uses: helm/kind-action@ae94020eaf628e9b9b9f341a10cc0cdcf5c018fb # v1.11.0
49+
uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0
5050
with:
5151
config: tests/scripts/multus/kind-config.yaml
5252
cluster_name: kind

.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
5656
# format to the repository Actions tab.
5757
- name: "Upload artifact"
58-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
58+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
5959
with:
6060
name: SARIF file
6161
path: results.sarif

.github/workflows/shellcheck.yaml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,10 @@ jobs:
2424
name: Shellcheck
2525
runs-on: ubuntu-latest
2626
steps:
27-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
28-
- name: Run ShellCheck
29-
uses: ludeeus/action-shellcheck@00b27aa7cb85167568cb48a3838b75f4265f2bca # master
30-
with:
31-
severity: warning
32-
check_together: 'yes'
33-
disable_matcher: false
34-
additional_files: build/reset build/sed-in-place
35-
ignore: olm
36-
format: gcc
27+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
28+
- name: install shellcheck
29+
run: |
30+
sudo apt-get update
31+
sudo apt-get install -y shellcheck
32+
- name: Run ShellCheck
33+
run: make shellcheck

.mergify.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ pull_request_rules:
224224
- "check-success=canary-tests / encryption-pvc-kms-vault-k8s-auth (quay.io/ceph/ceph:v19)"
225225
- "check-success=canary-tests / lvm-pvc (quay.io/ceph/ceph:v19)"
226226
- "check-success=canary-tests / multi-cluster-mirroring (quay.io/ceph/ceph:v19)"
227-
- "check-success=canary-tests / rgw-multisite-testing (quay.io/ceph/ceph:v19)"
228227
- "check-success=canary-tests / encryption-pvc-kms-ibm-kp (quay.io/ceph/ceph:v19)"
229228
- "check-success=canary-tests / multus-public-and-cluster (quay.io/ceph/ceph:v19)"
230229
- "check-success=TestCephSmokeSuite (v1.27.16)"
File renamed without changes.

ADOPTERS.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ To add your organization to this list, choose one of the following options:
1313

1414
- [Open a PR](https://rook.io/docs/rook/latest/Contributing/development-flow/#submitting-a-pull-request) to directly update this list
1515
- [Open a new issue](https://github.com/rook/rook/issues/new/choose) with the information
16-
- Send an email to [Steering committee members](https://github.com/rook/rook/blob/master/OWNERS.md#steering-committee) with the information
1716

18-
For the latter two options, a maintainer will submit a PR to update the table.
17+
For the latter option, a maintainer will submit a PR to update the table on your behalf.
1918
Please reach out to us on [Slack](https://slack.rook.io) with any questions.
2019

2120
If submitting a description, the addition will be at the end of first part of the list. If a description is not provided, the addition will be at the end of the full list.
@@ -67,6 +66,8 @@ If submitting a description, the addition will be at the end of first part of th
6766
* [Radio Sound](https://radiosound.com/) uses Rook to power their website and GitLab for their CI/CD
6867
pipeline, because of the truly cloud-native experience, like *"a little drop of the Google magic
6968
in our own server rack"*.
69+
* [Alauda](https://www.alauda.io/) Our container platform product(ACP) uses Rook Ceph to provide data
70+
persistence for applications, in addition to middleware backups, virtual machine disks, and more.
7071
* [CyCore Systems](https://www.cycoresys.com/)
7172
* [Datacom](http://datacom.co.nz/Home.aspx)
7273
* [Turtle Network (BLACK TURTLE BVBA)](https://www.turtlenetwork.eu/#home)

Documentation/Helm-Charts/operator-chart.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ The following table lists the configurable parameters of the rook-operator chart
5353
| `containerSecurityContext` | Set the container security context for the operator | `{"capabilities":{"drop":["ALL"]},"runAsGroup":2016,"runAsNonRoot":true,"runAsUser":2016}` |
5454
| `crds.enabled` | Whether the helm chart should create and update the CRDs. If false, the CRDs must be managed independently with deploy/examples/crds.yaml. **WARNING** Only set during first deployment. If later disabled the cluster may be DESTROYED. If the CRDs are deleted in this case, see [the disaster recovery guide](https://rook.io/docs/rook/latest/Troubleshooting/disaster-recovery/#restoring-crds-after-deletion) to restore them. | `true` |
5555
| `csi.attacher.repository` | Kubernetes CSI Attacher image repository | `"registry.k8s.io/sig-storage/csi-attacher"` |
56-
| `csi.attacher.tag` | Attacher image tag | `"v4.6.1"` |
56+
| `csi.attacher.tag` | Attacher image tag | `"v4.8.0"` |
5757
| `csi.cephFSAttachRequired` | Whether to skip any attach operation altogether for CephFS PVCs. See more details [here](https://kubernetes-csi.github.io/docs/skip-attach.html#skip-attach-with-csi-driver-object). If cephFSAttachRequired is set to false it skips the volume attachments and makes the creation of pods using the CephFS PVC fast. **WARNING** It's highly discouraged to use this for CephFS RWO volumes. Refer to this [issue](https://github.com/kubernetes/kubernetes/issues/103305) for more details. | `true` |
5858
| `csi.cephFSFSGroupPolicy` | Policy for modifying a volume's ownership or permissions when the CephFS PVC is being mounted. supported values are documented at https://kubernetes-csi.github.io/docs/support-fsgroup.html | `"File"` |
5959
| `csi.cephFSKernelMountOptions` | Set CephFS Kernel mount options to use https://docs.ceph.com/en/latest/man/8/mount.ceph/#options. Set to "ms_mode=secure" when connections.encrypted is enabled in CephCluster CR | `nil` |
@@ -111,7 +111,7 @@ The following table lists the configurable parameters of the rook-operator chart
111111
| `csi.pluginPriorityClassName` | PriorityClassName to be set on csi driver plugin pods | `"system-node-critical"` |
112112
| `csi.pluginTolerations` | Array of tolerations in YAML format which will be added to CephCSI plugin DaemonSet | `nil` |
113113
| `csi.provisioner.repository` | Kubernetes CSI provisioner image repository | `"registry.k8s.io/sig-storage/csi-provisioner"` |
114-
| `csi.provisioner.tag` | Provisioner image tag | `"v5.0.1"` |
114+
| `csi.provisioner.tag` | Provisioner image tag | `"v5.1.0"` |
115115
| `csi.provisionerNodeAffinity` | The node labels for affinity of the CSI provisioner deployment [^1] | `nil` |
116116
| `csi.provisionerPriorityClassName` | PriorityClassName to be set on csi driver provisioner pods | `"system-cluster-critical"` |
117117
| `csi.provisionerReplicas` | Set replicas for csi provisioner deployment | `2` |
@@ -123,9 +123,9 @@ The following table lists the configurable parameters of the rook-operator chart
123123
| `csi.rbdPluginUpdateStrategyMaxUnavailable` | A maxUnavailable parameter of CSI RBD plugin daemonset update strategy. | `1` |
124124
| `csi.rbdPodLabels` | Labels to add to the CSI RBD Deployments and DaemonSets Pods | `nil` |
125125
| `csi.registrar.repository` | Kubernetes CSI registrar image repository | `"registry.k8s.io/sig-storage/csi-node-driver-registrar"` |
126-
| `csi.registrar.tag` | Registrar image tag | `"v2.11.1"` |
126+
| `csi.registrar.tag` | Registrar image tag | `"v2.13.0"` |
127127
| `csi.resizer.repository` | Kubernetes CSI resizer image repository | `"registry.k8s.io/sig-storage/csi-resizer"` |
128-
| `csi.resizer.tag` | Resizer image tag | `"v1.11.1"` |
128+
| `csi.resizer.tag` | Resizer image tag | `"v1.13.1"` |
129129
| `csi.serviceMonitor.enabled` | Enable ServiceMonitor for Ceph CSI drivers | `false` |
130130
| `csi.serviceMonitor.interval` | Service monitor scrape interval | `"10s"` |
131131
| `csi.serviceMonitor.labels` | ServiceMonitor additional labels | `{}` |

Documentation/Storage-Configuration/Ceph-CSI/custom-images.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ The default upstream images are included below, which you can change to your des
1919

2020
```yaml
2121
ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.13.0"
22-
ROOK_CSI_REGISTRAR_IMAGE: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.11.1"
23-
ROOK_CSI_PROVISIONER_IMAGE: "registry.k8s.io/sig-storage/csi-provisioner:v5.0.1"
24-
ROOK_CSI_ATTACHER_IMAGE: "registry.k8s.io/sig-storage/csi-attacher:v4.6.1"
25-
ROOK_CSI_RESIZER_IMAGE: "registry.k8s.io/sig-storage/csi-resizer:v1.11.1"
22+
ROOK_CSI_REGISTRAR_IMAGE: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0"
23+
ROOK_CSI_PROVISIONER_IMAGE: "registry.k8s.io/sig-storage/csi-provisioner:v5.1.0"
24+
ROOK_CSI_ATTACHER_IMAGE: "registry.k8s.io/sig-storage/csi-attacher:v4.8.0"
25+
ROOK_CSI_RESIZER_IMAGE: "registry.k8s.io/sig-storage/csi-resizer:v1.13.1"
2626
ROOK_CSI_SNAPSHOTTER_IMAGE: "registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0"
2727
ROOK_CSIADDONS_IMAGE: "quay.io/csiaddons/k8s-sidecar:v0.11.0"
2828
```

0 commit comments

Comments
 (0)