Skip to content

merge queue: embarking devel (8b9bc61) and #5829 together #5994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
mergify wants to merge 14 commits into from
Closed

merge queue: embarking devel (8b9bc61) and #5829 together #5994

mergify wants to merge 14 commits into from

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jan 29, 2026 •
edited
Loading

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

Branch devel (8b9bc61) and #5829 are embarked together for merge.

This pull request has been created by Mergify to speculatively check the mergeability of #5829.
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:
      • base~=^(release-.+)$
      • any of:
        • label=ci/skip/e2e
        • all of:
          • status-success=ci/centos/mini-e2e-helm/k8s-1.32
          • 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/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.33
          • status-success=ci/centos/mini-e2e-helm/k8s-1.34
          • 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=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/mini-e2e-helm/k8s-1.31
          • status-success=ci/centos/mini-e2e-helm/k8s-1.32
          • 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/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.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:
      • any of:
        • label=ci/skip/e2e
        • all of:
          • status-success=ci/centos/mini-e2e-helm/k8s-1.32
          • 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/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.33
          • status-success=ci/centos/mini-e2e-helm/k8s-1.34
          • status-success=ci/centos/upgrade-tests-cephfs
          • status-success=ci/centos/upgrade-tests-rbd
      • base=devel
      • 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 >= 2 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]

Required conditions to stay in the queue:

---
checking_base_sha: 8b9bc61b2c92edda98d917cfafaced2577374a3c
previous_failed_batches: []
pull_requests:
  - number: 5829
...

nixpanic and others added 14 commits January 23, 2026 14:52
@nixpanic
nfs: create helpers for storing volume attributes in the journal
dde5bfb 
Signed-off-by: Niels de Vos <[email protected]>
@nixpanic
nfs: fail early in NodeGetVolumeStats
67c2da3 
All functions use a fail-early-continue-on-success flow,
NodeGetVolumeStats was not following this.

Signed-off-by: Niels de Vos <[email protected]>
@nixpanic
nfs: move NFSVolume to shared types package
b4f47c3 
Signed-off-by: Niels de Vos <[email protected]>
@nixpanic
nfs: make paramServer shared option public
0756d54 
Signed-off-by: Niels de Vos <[email protected]>
@nixpanic
nfs: implement ControllerModifyVolume to change NFS-server hostname
d17b236 
The new hostname of the NFS-server is stored in a journal entry for the
volume. The new NFS-server will only be used the next time the NFS
Volume is mounted on a worker node.

It is not possible to update the VolumeContext of a Volume, so the old
hostname of the NFS=server will be stored there forever.

Closes: #5420
Signed-off-by: Niels de Vos <[email protected]>
@nixpanic
e2e: cleanup k8s.io module dependencies
14f6168 
Signed-off-by: Niels de Vos <[email protected]>
@nixpanic
e2e: add VolumeAttributesClass test for NFS
8e5d8a8 
Signed-off-by: Niels de Vos <[email protected]>
@nixpanic
doc: include reference to NFS/ControllerModifyVolume in release-notes
32d3ed3 
Signed-off-by: Niels de Vos <[email protected]>
@nixpanic
testing: use canary images for csi-resizer/provisioner
4207011 
Only the canary version suppors the VolumeAttributesClass with secrets
in the ControllerModifyVolume gRPC.

Signed-off-by: Niels de Vos <[email protected]>
@nixpanic
deploy: allow NFS-provisioner to access volumeattributesclasses
cda6d39 
Signed-off-by: Niels de Vos <[email protected]>
@nixpanic
ci: include publish-secret in StorageClass for NFS
b76f376 
The NFS node-plugin does not support staging, it only uses publishing.
For VolumeAttributeClass / ControllerModifyVolume the mutable parameters
are stored in the Ceph backend. This means that during volume publishing
the node-plugin needs to get the updated parameters from the Ceph
cluster (hence the publish secret requirement).

/tmp/csi has been added to the node-plugin Pod so that the temporary
credentials file can be written.

Signed-off-by: Niels de Vos <[email protected]>
@nixpanic
doc: mention support for NFS-server hostname changing
af7e02b 
Signed-off-by: Niels de Vos <[email protected]>
@nixpanic
doc: add details about VolumeAttributeClass secrets
ea99e05 
Only Kubernetes 1.34 and newer support VolumeAttributeClass
functionality (GA). Ceph-CSI also depends on certain versions of the
Kubernetes CSI external-provisioner and external-resizer.

See-also: kubernetes-csi/docs#631
Signed-off-by: Niels de Vos <[email protected]>
@mergify
Merge of #5829
457d1b7
@ceph-csi-bot ceph-csi-bot added component/nfs Issues related to NFS queued dequeued ok-to-test Label to trigger E2E tests labels Jan 29, 2026
@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Jan 29, 2026

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

@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Jan 29, 2026

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

@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Jan 29, 2026

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

@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Jan 29, 2026

/test ci/centos/upgrade-tests-cephfs

@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Jan 29, 2026

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

@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Jan 29, 2026

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

@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Jan 29, 2026

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

@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Jan 29, 2026

/test ci/centos/upgrade-tests-rbd

@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Jan 29, 2026

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

@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Jan 29, 2026

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

@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Jan 29, 2026

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

@ceph-csi-bot ceph-csi-bot removed the ok-to-test Label to trigger E2E tests label Jan 29, 2026
@mergify mergify bot mentioned this pull request Jan 29, 2026
Open
@mergify mergify bot closed this Jan 29, 2026
@mergify mergify bot deleted the mergify/merge-queue/29b6a6634e branch January 29, 2026 13:44
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

component/nfs Issues related to NFS dequeued queued

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@ceph-csi-bot @nixpanic