Skip to content

merge queue: embarking release-v3.16 (61598af) and #6022 together#6025

Closed
mergify[bot] wants to merge 7 commits intorelease-v3.16from
mergify/merge-queue/041a0a83aa
Closed

merge queue: embarking release-v3.16 (61598af) and #6022 together#6025
mergify[bot] wants to merge 7 commits intorelease-v3.16from
mergify/merge-queue/041a0a83aa

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 5, 2026 •
edited
Loading

✨ Pull request #6022 which was ahead in the queue has been dequeued (for the following reason: checks failed). ✨

Branch release-v3.16 (61598af) and #6022 are embarked together for merge.

This pull request has been created by Mergify to speculatively check the mergeability of #6022.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.

Required conditions of queue default for merge:

  • any of:
    • all of:
      • any of:
        • label=ci/skip/e2e
        • all of:
          • status-success=ci/centos/k8s-e2e-external-storage/1.32
          • status-success=ci/centos/k8s-e2e-external-storage/1.33
          • status-success=ci/centos/k8s-e2e-external-storage/1.34
          • status-success=ci/centos/mini-e2e-helm/k8s-1.32
          • status-success=ci/centos/mini-e2e-helm/k8s-1.33
          • status-success=ci/centos/mini-e2e-helm/k8s-1.34
          • status-success=ci/centos/mini-e2e/k8s-1.32
          • status-success=ci/centos/mini-e2e/k8s-1.33
          • status-success=ci/centos/mini-e2e/k8s-1.34
          • status-success=ci/centos/upgrade-tests-cephfs
          • status-success=ci/centos/upgrade-tests-rbd
      • base~=^(release-.+)$
      • status-success=codespell
      • status-success=go-test
      • status-success=golangci-lint
      • status-success=lint-extras
      • status-success=mod-check
      • status-success=multi-arch-build
      • status-success=uncommitted-code-check
    • all of:
      • base=release-v3.15
      • any of:
        • label=ci/skip/e2e
        • all of:
          • status-success=ci/centos/k8s-e2e-external-storage/1.31
          • status-success=ci/centos/k8s-e2e-external-storage/1.32
          • status-success=ci/centos/k8s-e2e-external-storage/1.33
          • status-success=ci/centos/mini-e2e-helm/k8s-1.31
          • status-success=ci/centos/mini-e2e-helm/k8s-1.32
          • status-success=ci/centos/mini-e2e-helm/k8s-1.33
          • status-success=ci/centos/mini-e2e/k8s-1.31
          • status-success=ci/centos/mini-e2e/k8s-1.32
          • status-success=ci/centos/mini-e2e/k8s-1.33
          • status-success=ci/centos/upgrade-tests-cephfs
          • status-success=ci/centos/upgrade-tests-rbd
      • status-success=codespell
      • status-success=go-test
      • status-success=golangci-lint
      • status-success=lint-extras
      • status-success=mod-check
      • status-success=multi-arch-build
      • status-success=uncommitted-code-check
    • all of:
      • base=devel
      • any of:
        • label=ci/skip/e2e
        • all of:
          • status-success=ci/centos/k8s-e2e-external-storage/1.33
          • status-success=ci/centos/k8s-e2e-external-storage/1.34
          • status-success=ci/centos/k8s-e2e-external-storage/1.35
          • status-success=ci/centos/mini-e2e-helm/k8s-1.33
          • status-success=ci/centos/mini-e2e-helm/k8s-1.34
          • status-success=ci/centos/mini-e2e-helm/k8s-1.35
          • status-success=ci/centos/mini-e2e/k8s-1.33
          • status-success=ci/centos/mini-e2e/k8s-1.34
          • status-success=ci/centos/mini-e2e/k8s-1.35
          • status-success=ci/centos/upgrade-tests-cephfs
          • status-success=ci/centos/upgrade-tests-rbd
      • status-success=codespell
      • status-success=go-test
      • status-success=golangci-lint
      • status-success=lint-extras
      • status-success=mod-check
      • status-success=multi-arch-build
      • status-success=uncommitted-code-check
    • all of:
      • base=ci/centos
      • status-success=ci/centos/jjb-validate
      • status-success=ci/centos/job-validation
  • #approved-reviews-by >= 1 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]

Required conditions to stay in the queue:

---
checking_base_sha: 61598af5c64d6d5f8b34b482f02068f4ec18c423
previous_failed_batches: []
pull_requests:
  - number: 6022
...

black-dragon74 and others added 7 commits February 5, 2026 10:34
@black-dragon74
util: add validator for VolumeID
7cba241 
This patch adds a validator function for volumeID
which asserts that the value matches the expected
format.

Signed-off-by: Niraj Yadav <niryadav@redhat.com>
(cherry picked from commit e2a1f6e)
@black-dragon74
rbd: use ValidateVolumeID for input validation
7a9e0cb 
This patch modifies RBD controllerserver and nodeserver
methods to use `util.ValidateVolumeID`.

It is done to ensure the provided VolumeId in the gRPC
matches the expected format.

Signed-off-by: Niraj Yadav <niryadav@redhat.com>
Reported-by: Shaul Ben Hai <shaul.benhai@sentinelone.com>
(cherry picked from commit 92f2cbe)
@black-dragon74
cephfs: use ValidateVolumeID for input validation
2c2e452 
This patch modifies CephFS controllerserver and nodeserver
methods to use `util.ValidateVolumeID`.

It is done to ensure the provided VolumeId in the gRPC
matches the expected format.

Signed-off-by: Niraj Yadav <niryadav@redhat.com>
Reported-by: Shaul Ben Hai <shaul.benhai@sentinelone.com>
(cherry picked from commit 4a84240)
@black-dragon74
nvmeof: use ValidateVolumeID for input validation
003ed89 
This patch modifies nvmeof controllerserver and nodeserver
methods to use `util.ValidateVolumeID`.

It is done to ensure the provided VolumeId in the gRPC
matches the expected format.

Signed-off-by: Niraj Yadav <niryadav@redhat.com>
Reported-by: Shaul Ben Hai <shaul.benhai@sentinelone.com>
(cherry picked from commit 1e8f314)
@black-dragon74
util: Adapt ValidateVolumeID for static volumes
3782eed 
This patch modifies `ValidateVolumeID` to include a flag which
once set, skips the format enforcement.

This is required in case of static volumes where the VolumeID
could differ from the expected format.

The code elsewhere is modified to consume `VolumeContext` and check
if `staticVolume` is set to true. If `VolumeContext` is not present
the format enforcement is skipped using the aforementioned flag.

Signed-off-by: Niraj Yadav <niryadav@redhat.com>
(cherry picked from commit 9518c98)
@black-dragon74
nfs: use ValidateVolumeID for input validation
424a1e0 
This patch modifies nfs controllerserver and nodeserver
methods to use `util.ValidateVolumeID`.

It is done to ensure the provided VolumeId in the gRPC
matches the expected format.

Signed-off-by: Niraj Yadav <niryadav@redhat.com>
Reported-by: Shaul Ben Hai <shaul.benhai@sentinelone.com>
(cherry picked from commit 9619c7c)
@mergify
Merge of #6022
8239b14
@ceph-csi-bot ceph-csi-bot added queued ok-to-test Label to trigger E2E tests labels Feb 5, 2026
@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Feb 5, 2026

/test ci/centos/k8s-e2e-external-storage/1.32

@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Feb 5, 2026

/test ci/centos/upgrade-tests-cephfs

@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Feb 5, 2026

/test ci/centos/k8s-e2e-external-storage/1.33

@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Feb 5, 2026

/test ci/centos/k8s-e2e-external-storage/1.34

@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Feb 5, 2026

/test ci/centos/mini-e2e-helm/k8s-1.32

@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Feb 5, 2026

/test ci/centos/upgrade-tests-rbd

@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Feb 5, 2026

/test ci/centos/mini-e2e-helm/k8s-1.34

@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Feb 5, 2026

/test ci/centos/mini-e2e-helm/k8s-1.33

@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Feb 5, 2026

/test ci/centos/mini-e2e/k8s-1.32

@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Feb 5, 2026

/test ci/centos/mini-e2e/k8s-1.33

@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Feb 5, 2026

/test ci/centos/mini-e2e/k8s-1.34

@ceph-csi-bot ceph-csi-bot removed the ok-to-test Label to trigger E2E tests label Feb 5, 2026
@mergify mergify bot mentioned this pull request Feb 5, 2026
Open
@mergify mergify bot closed this Feb 5, 2026
@mergify mergify bot deleted the mergify/merge-queue/041a0a83aa branch February 5, 2026 09:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

queued

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@ceph-csi-bot @black-dragon74