From 961c0a8d85035a5ee4854e3960ce1b8df8b90166 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Fri, 27 Sep 2024 14:32:11 +0200 Subject: [PATCH 1/7] e2e: enable more k8s storage tests enable more rbd specific storage tests Signed-off-by: Madhu Rajanna --- scripts/k8s-storage/driver-rbd-rwo.yaml | 8 ++++---- scripts/k8s-storage/volumesnapshotclass-rbd.yaml.in | 11 +++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 scripts/k8s-storage/volumesnapshotclass-rbd.yaml.in diff --git a/scripts/k8s-storage/driver-rbd-rwo.yaml b/scripts/k8s-storage/driver-rbd-rwo.yaml index c2c888e6736..a0827aca7db 100644 --- a/scripts/k8s-storage/driver-rbd-rwo.yaml +++ b/scripts/k8s-storage/driver-rbd-rwo.yaml @@ -6,7 +6,7 @@ StorageClass: SnapshotClass: # Must be set to enable snapshotting tests - FromName: true + FromExistingClassName: k8s-storage-e2e-rbd DriverInfo: # Internal name of the driver, display name in the test case and test objects @@ -51,7 +51,7 @@ DriverInfo: volumeLimits: false # Support for volume expansion in controllers - controllerExpansion: false + controllerExpansion: true # Support for volume expansion in nodes nodeExpansion: true @@ -66,7 +66,7 @@ DriverInfo: topology: false # Support populate data from snapshot - snapshotDataSource: false + snapshotDataSource: true # Support populated data from PVC - pvcDataSource: false + pvcDataSource: true diff --git a/scripts/k8s-storage/volumesnapshotclass-rbd.yaml.in b/scripts/k8s-storage/volumesnapshotclass-rbd.yaml.in new file mode 100644 index 00000000000..499c70e686c --- /dev/null +++ b/scripts/k8s-storage/volumesnapshotclass-rbd.yaml.in @@ -0,0 +1,11 @@ +--- +apiVersion: snapshot.storage.k8s.io/v1 +kind: VolumeSnapshotClass +metadata: + name: k8s-storage-e2e-rbd +driver: rbd.csi.ceph.com +parameters: + clusterID: @@CLUSTER_ID@@ + csi.storage.k8s.io/snapshotter-secret-name: rook-csi-rbd-provisioner + csi.storage.k8s.io/snapshotter-secret-namespace: rook-ceph +deletionPolicy: Delete From 39a4984207ba95307cc1de938243767f51056de2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 20:35:38 +0000 Subject: [PATCH 2/7] rebase: bump github.com/aws/aws-sdk-go-v2/service/sts Bumps the github-dependencies group with 1 update: [github.com/aws/aws-sdk-go-v2/service/sts](https://github.com/aws/aws-sdk-go-v2). Updates `github.com/aws/aws-sdk-go-v2/service/sts` from 1.31.1 to 1.31.3 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.31.1...service/s3/v1.31.3) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/sts dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- .../github.com/aws/aws-sdk-go-v2/service/sts/CHANGELOG.md | 8 ++++++++ .../aws/aws-sdk-go-v2/service/sts/go_module_metadata.go | 2 +- vendor/modules.txt | 2 +- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 6a52cd37380..5d62a3ebbd9 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22.5 require ( github.com/IBM/keyprotect-go-client v0.15.1 github.com/aws/aws-sdk-go v1.55.5 - github.com/aws/aws-sdk-go-v2/service/sts v1.31.1 + github.com/aws/aws-sdk-go-v2/service/sts v1.31.3 github.com/ceph/ceph-csi/api v0.0.0-00010101000000-000000000000 github.com/ceph/go-ceph v0.29.0 github.com/container-storage-interface/spec v1.10.0 diff --git a/go.sum b/go.sum index 7af723d2e34..66757015b9c 100644 --- a/go.sum +++ b/go.sum @@ -1416,8 +1416,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.5 h1:QFASJGf github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.5/go.mod h1:QdZ3OmoIjSX+8D1OPAzPxDfjXASbBMDsz9qvtyIhtik= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.20 h1:Xbwbmk44URTiHNx6PNo0ujDE6ERlsCKJD3u1zfnzAPg= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.20/go.mod h1:oAfOFzUB14ltPZj1rWwRc3d/6OgD76R8KlvU3EqM9Fg= -github.com/aws/aws-sdk-go-v2/service/sts v1.31.1 h1:8K0UNOkZiK9Uh3HIF6Bx0rcNCftqGCeKmOaR7Gp5BSo= -github.com/aws/aws-sdk-go-v2/service/sts v1.31.1/go.mod h1:yMWe0F+XG0DkRZK5ODZhG7BEFYhLXi2dqGsv6tX0cgI= +github.com/aws/aws-sdk-go-v2/service/sts v1.31.3 h1:VzudTFrDCIDakXtemR7l6Qzt2+JYsVqo2MxBPt5k8T8= +github.com/aws/aws-sdk-go-v2/service/sts v1.31.3/go.mod h1:yMWe0F+XG0DkRZK5ODZhG7BEFYhLXi2dqGsv6tX0cgI= github.com/aws/smithy-go v1.21.0 h1:H7L8dtDRk0P1Qm6y0ji7MCYMQObJ5R9CRpyPhRUkLYA= github.com/aws/smithy-go v1.21.0/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/sts/CHANGELOG.md b/vendor/github.com/aws/aws-sdk-go-v2/service/sts/CHANGELOG.md index 7dad3312a84..d7151090ba3 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/sts/CHANGELOG.md +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/sts/CHANGELOG.md @@ -1,3 +1,11 @@ +# v1.31.3 (2024-09-27) + +* No change notes available for this release. + +# v1.31.2 (2024-09-25) + +* No change notes available for this release. + # v1.31.1 (2024-09-23) * No change notes available for this release. diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/sts/go_module_metadata.go b/vendor/github.com/aws/aws-sdk-go-v2/service/sts/go_module_metadata.go index 1699b98e2f9..0f759930fdb 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/sts/go_module_metadata.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/sts/go_module_metadata.go @@ -3,4 +3,4 @@ package sts // goModuleVersion is the tagged release for this module -const goModuleVersion = "1.31.1" +const goModuleVersion = "1.31.3" diff --git a/vendor/modules.txt b/vendor/modules.txt index 115464f13a8..f2ca75b2e13 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -162,7 +162,7 @@ github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding # github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.20 ## explicit; go 1.21 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url -# github.com/aws/aws-sdk-go-v2/service/sts v1.31.1 +# github.com/aws/aws-sdk-go-v2/service/sts v1.31.3 ## explicit; go 1.21 github.com/aws/aws-sdk-go-v2/service/sts github.com/aws/aws-sdk-go-v2/service/sts/internal/endpoints From b18f5b465455a8ad4715c399e108eadaf58b754a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 21:00:34 +0000 Subject: [PATCH 3/7] rebase: bump github/codeql-action from 3.26.8 to 3.26.10 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.8 to 3.26.10. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/294a9d92911152fe08befb9ec03e240add280cb3...e2b3eafc8d227b0241d48be5f425d47c2d750a13) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/snyk-container-image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/snyk-container-image.yaml b/.github/workflows/snyk-container-image.yaml index feeb0f7bf45..8b6398edcb4 100644 --- a/.github/workflows/snyk-container-image.yaml +++ b/.github/workflows/snyk-container-image.yaml @@ -41,6 +41,6 @@ jobs: args: --file=Dockerfilei - name: Upload result to GitHub Code Scanning # yamllint disable-line rule:line-length - uses: github/codeql-action/upload-sarif@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8 + uses: github/codeql-action/upload-sarif@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10 with: sarif_file: snyk.sarif From 5aec13d7e6b3926007265dc3c6dae6698d2b0203 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 21:00:47 +0000 Subject: [PATCH 4/7] rebase: bump actions/checkout from 4.1.7 to 4.2.0 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.7 to 4.2.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/692973e3d937129bcbf40652eb9f2f61becf3332...d632683dd7b4114ad314bca15554477dd762a938) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/build-multi-stage.yaml | 2 +- .github/workflows/codespell.yaml | 2 +- .github/workflows/commitlint.yaml | 2 +- .github/workflows/dependency-review.yaml | 2 +- .github/workflows/go-test.yaml | 8 ++++---- .github/workflows/golangci-lint.yaml | 2 +- .github/workflows/lint-extras.yaml | 2 +- .github/workflows/mod-check.yaml | 2 +- .github/workflows/publish-artifacts.yaml | 2 +- .github/workflows/snyk-container-image.yaml | 2 +- .github/workflows/snyk.yaml | 2 +- .github/workflows/test-retest-action.yaml | 2 +- .github/workflows/tickgit.yaml | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build-multi-stage.yaml b/.github/workflows/build-multi-stage.yaml index 55549c6e657..98b7b305c48 100644 --- a/.github/workflows/build-multi-stage.yaml +++ b/.github/workflows/build-multi-stage.yaml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: # yamllint disable-line rule:line-length - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: multi-arch-build # yamllint disable-line rule:line-length if: ${{ ! contains(github.event.pull_request.labels.*.name, 'ci/skip/multi-arch-build') }} diff --git a/.github/workflows/codespell.yaml b/.github/workflows/codespell.yaml index 2b0de44297f..d92c9046736 100644 --- a/.github/workflows/codespell.yaml +++ b/.github/workflows/codespell.yaml @@ -16,6 +16,6 @@ jobs: runs-on: ubuntu-latest steps: # yamllint disable-line rule:line-length - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: codespell run: make containerized-test TARGET=codespell diff --git a/.github/workflows/commitlint.yaml b/.github/workflows/commitlint.yaml index 877151a0f1b..733783cfdb0 100644 --- a/.github/workflows/commitlint.yaml +++ b/.github/workflows/commitlint.yaml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: # yamllint disable-line rule:line-length - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: ref: ${{ github.event.pull_request.head.sha }} - name: commitlint diff --git a/.github/workflows/dependency-review.yaml b/.github/workflows/dependency-review.yaml index 867c2674d34..0985bbcde02 100644 --- a/.github/workflows/dependency-review.yaml +++ b/.github/workflows/dependency-review.yaml @@ -16,7 +16,7 @@ jobs: steps: - name: 'Checkout Repository' # yamllint disable-line rule:line-length - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: 'Dependency Review' # yamllint disable-line rule:line-length uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # v4.3.4 diff --git a/.github/workflows/go-test.yaml b/.github/workflows/go-test.yaml index 1818375de48..2705adcdfc0 100644 --- a/.github/workflows/go-test.yaml +++ b/.github/workflows/go-test.yaml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout the repo # yamllint disable-line rule:line-length - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: Check generated deploy code run: make generate-deploy @@ -31,7 +31,7 @@ jobs: runs-on: ubuntu-latest steps: # yamllint disable-line rule:line-length - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: e2e-build-test run: make containerized-build TARGET=e2e.test go-test: @@ -39,7 +39,7 @@ jobs: runs-on: ubuntu-latest steps: # yamllint disable-line rule:line-length - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: go-test run: make containerized-test TARGET=go-test go-test-api: @@ -47,6 +47,6 @@ jobs: runs-on: ubuntu-latest steps: # yamllint disable-line rule:line-length - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: go-test-api run: make containerized-test TARGET=go-test-api diff --git a/.github/workflows/golangci-lint.yaml b/.github/workflows/golangci-lint.yaml index f0473ef8d09..7badf36c0fc 100644 --- a/.github/workflows/golangci-lint.yaml +++ b/.github/workflows/golangci-lint.yaml @@ -14,6 +14,6 @@ jobs: runs-on: ubuntu-latest steps: # yamllint disable-line rule:line-length - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: golangci-lint run: make containerized-test TARGET=go-lint diff --git a/.github/workflows/lint-extras.yaml b/.github/workflows/lint-extras.yaml index 8c04d7eea6c..7cf5f951035 100644 --- a/.github/workflows/lint-extras.yaml +++ b/.github/workflows/lint-extras.yaml @@ -14,6 +14,6 @@ jobs: runs-on: ubuntu-latest steps: # yamllint disable-line rule:line-length - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: lint-extras run: make containerized-test TARGET=lint-extras diff --git a/.github/workflows/mod-check.yaml b/.github/workflows/mod-check.yaml index 3809d9e393e..0f682833dd9 100644 --- a/.github/workflows/mod-check.yaml +++ b/.github/workflows/mod-check.yaml @@ -14,6 +14,6 @@ jobs: runs-on: ubuntu-latest steps: # yamllint disable-line rule:line-length - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: mod-check run: make containerized-test TARGET=mod-check diff --git a/.github/workflows/publish-artifacts.yaml b/.github/workflows/publish-artifacts.yaml index 066a9681d57..439bd9fac67 100644 --- a/.github/workflows/publish-artifacts.yaml +++ b/.github/workflows/publish-artifacts.yaml @@ -19,7 +19,7 @@ jobs: if: github.repository == 'ceph/ceph-csi' steps: # yamllint disable-line rule:line-length - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: Login to Quay # yamllint disable-line rule:line-length diff --git a/.github/workflows/snyk-container-image.yaml b/.github/workflows/snyk-container-image.yaml index 8b6398edcb4..0a6080abef3 100644 --- a/.github/workflows/snyk-container-image.yaml +++ b/.github/workflows/snyk-container-image.yaml @@ -27,7 +27,7 @@ jobs: runs-on: ubuntu-latest steps: # yamllint disable-line rule:line-length - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: Build a Docker image run: make image-cephcsi - name: Run Snyk to check Docker image for vulnerabilities diff --git a/.github/workflows/snyk.yaml b/.github/workflows/snyk.yaml index 8ee96f14d5b..4bf9ba772dc 100644 --- a/.github/workflows/snyk.yaml +++ b/.github/workflows/snyk.yaml @@ -21,7 +21,7 @@ jobs: steps: - name: checkout # yamllint disable-line rule:line-length - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: fetch-depth: 0 diff --git a/.github/workflows/test-retest-action.yaml b/.github/workflows/test-retest-action.yaml index 183bda6336e..aef7d93021b 100644 --- a/.github/workflows/test-retest-action.yaml +++ b/.github/workflows/test-retest-action.yaml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: # yamllint disable-line rule:line-length - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: Docker build # Run cd to avoid loading complete cephcsi directory in docker context diff --git a/.github/workflows/tickgit.yaml b/.github/workflows/tickgit.yaml index 106e380fdbb..63c35afec1b 100644 --- a/.github/workflows/tickgit.yaml +++ b/.github/workflows/tickgit.yaml @@ -15,5 +15,5 @@ jobs: runs-on: ubuntu-latest steps: # yamllint disable-line rule:line-length - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - run: make containerized-test TARGET=tickgit From 1494f9bf9505e07080e38f9389e6a1ab9b9d3280 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Tue, 1 Oct 2024 08:14:00 +0200 Subject: [PATCH 5/7] e2e: rename rbd file name for external test renamed rbd file name to match other file names for external test Signed-off-by: Madhu Rajanna --- scripts/k8s-storage/{driver-rbd-rwo.yaml => driver-rbd.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename scripts/k8s-storage/{driver-rbd-rwo.yaml => driver-rbd.yaml} (100%) diff --git a/scripts/k8s-storage/driver-rbd-rwo.yaml b/scripts/k8s-storage/driver-rbd.yaml similarity index 100% rename from scripts/k8s-storage/driver-rbd-rwo.yaml rename to scripts/k8s-storage/driver-rbd.yaml From b679981f24ed7a11c1d8c13459cb49f1c2b30231 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Tue, 1 Oct 2024 08:14:49 +0200 Subject: [PATCH 6/7] e2e: update rbd driver name in external test updating rbd driver name and the storageclass name to match the functionality and other drivers. Signed-off-by: Madhu Rajanna --- scripts/k8s-storage/driver-rbd.yaml | 6 +++--- scripts/k8s-storage/sc-rbd.yaml.in | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/k8s-storage/driver-rbd.yaml b/scripts/k8s-storage/driver-rbd.yaml index a0827aca7db..cc688c7feb0 100644 --- a/scripts/k8s-storage/driver-rbd.yaml +++ b/scripts/k8s-storage/driver-rbd.yaml @@ -1,7 +1,7 @@ --- -ShortName: cephcsi-rbd-rwo-test +ShortName: cephcsi-rbd-test StorageClass: - FromExistingClassName: k8s-storage-e2e-rbd-rwo + FromExistingClassName: k8s-storage-e2e-rbd # FromFile: sc-rbd.yaml SnapshotClass: @@ -10,7 +10,7 @@ SnapshotClass: DriverInfo: # Internal name of the driver, display name in the test case and test objects - Name: rbd-rwo.csi.ceph.com + Name: rbd.csi.ceph.com # The range of disk size supported by this driver SupportedSizeRange: diff --git a/scripts/k8s-storage/sc-rbd.yaml.in b/scripts/k8s-storage/sc-rbd.yaml.in index c3d09d161ae..c207aa0f51c 100644 --- a/scripts/k8s-storage/sc-rbd.yaml.in +++ b/scripts/k8s-storage/sc-rbd.yaml.in @@ -2,7 +2,7 @@ apiVersion: storage.k8s.io/v1 kind: StorageClass metadata: - name: k8s-storage-e2e-rbd-rwo + name: k8s-storage-e2e-rbd provisioner: rbd.csi.ceph.com parameters: clusterID: @@CLUSTER_ID@@ From 6c942d503072c51441cec382c9f89b9eb2356093 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Tue, 1 Oct 2024 10:44:25 +0200 Subject: [PATCH 7/7] ci: enable more tests for rbd enabling multipods, RWOP and ROX tests for rbd. Signed-off-by: Madhu Rajanna --- scripts/k8s-storage/driver-rbd.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/k8s-storage/driver-rbd.yaml b/scripts/k8s-storage/driver-rbd.yaml index cc688c7feb0..eb612b87ea1 100644 --- a/scripts/k8s-storage/driver-rbd.yaml +++ b/scripts/k8s-storage/driver-rbd.yaml @@ -70,3 +70,12 @@ DriverInfo: # Support populated data from PVC pvcDataSource: true + + # multiple pods on a node can use the same volume concurrently + multipods: true + + # support ReadWriteOncePod access mode + readWriteOncePod: true + + # supports ROX AccessMode in PVC for PVC with Snapshot DataSource + capReadOnlyMany: true