Skip to content

merge queue: embarking devel (9619c7c) and #5829 together#6029

Closed
mergify[bot] wants to merge 14 commits into
develfrom
mergify/merge-queue/29b6a6634e
Closed

merge queue: embarking devel (9619c7c) and #5829 together#6029
mergify[bot] wants to merge 14 commits into
develfrom
mergify/merge-queue/29b6a6634e

Conversation

@mergify

@mergify mergify Bot commented Feb 6, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

🎉 This pull request has been checked successfully and will be merged soon. 🎉

Branch devel (9619c7c) 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:

  • #approved-reviews-by >= 2 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
  • any of:
    • all of:
      • 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
      • any of:
        • 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
        • label=ci/skip/e2e
    • all of:
      • base~=^(release-.+)$
      • any of:
        • label=ci/skip/e2e
        • all of:
          • status-success=ci/centos/k8s-e2e-external-storage/1.32
          • status-success=ci/centos/mini-e2e-helm/k8s-1.32
          • status-success=ci/centos/mini-e2e/k8s-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/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
      • 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/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/k8s-e2e-external-storage/1.33
          • status-success=ci/centos/mini-e2e-helm/k8s-1.33
          • 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=ci/centos
      • status-success=ci/centos/jjb-validate
      • status-success=ci/centos/job-validation

Required conditions to stay in the queue:

---
checking_base_sha: 9619c7cb17f044c5c846e007714c6d2b14acfb17
previous_failed_batches: []
pull_requests:
  - number: 5829
...

nixpanic and others added 14 commits February 5, 2026 09:03
@nixpanic
nfs: create helpers for storing volume attributes in the journal
bfb3105 
Signed-off-by: Niels de Vos <ndevos@ibm.com>
@nixpanic
nfs: fail early in NodeGetVolumeStats
48f42d3 
All functions use a fail-early-continue-on-success flow,
NodeGetVolumeStats was not following this.

Signed-off-by: Niels de Vos <ndevos@ibm.com>
@nixpanic
nfs: move NFSVolume to shared types package
f9cec9a 
Signed-off-by: Niels de Vos <ndevos@ibm.com>
@nixpanic
nfs: make paramServer shared option public
52932ea 
Signed-off-by: Niels de Vos <ndevos@ibm.com>
@nixpanic
nfs: implement ControllerModifyVolume to change NFS-server hostname
ce90778 
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 <ndevos@ibm.com>
@nixpanic
e2e: cleanup k8s.io module dependencies
05407b9 
Signed-off-by: Niels de Vos <ndevos@ibm.com>
@nixpanic
e2e: add VolumeAttributesClass test for NFS
80b65b7 
Signed-off-by: Niels de Vos <ndevos@ibm.com>
@nixpanic
doc: include reference to NFS/ControllerModifyVolume in release-notes
0016f37 
Signed-off-by: Niels de Vos <ndevos@ibm.com>
@nixpanic
testing: use canary images for csi-resizer/provisioner
29b353e 
Only the canary version suppors the VolumeAttributesClass with secrets
in the ControllerModifyVolume gRPC.

Signed-off-by: Niels de Vos <ndevos@ibm.com>
@nixpanic
deploy: allow NFS-provisioner to access volumeattributesclasses
56d32c3 
Signed-off-by: Niels de Vos <ndevos@ibm.com>
@nixpanic
ci: include publish-secret in StorageClass for NFS
72cef3f 
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 <ndevos@ibm.com>
@nixpanic
doc: mention support for NFS-server hostname changing
5f882c5 
Signed-off-by: Niels de Vos <ndevos@ibm.com>
@nixpanic
doc: add details about VolumeAttributeClass secrets
b4565bd 
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 <ndevos@ibm.com>
@mergify
Merge of #5829
0eb9bb4
@ceph-csi-bot ceph-csi-bot added component/nfs Issues related to NFS queued ok-to-test Label to trigger E2E tests labels Feb 6, 2026
@ceph-csi-bot

ceph-csi-bot commented Feb 6, 2026

Copy link
Copy Markdown
Collaborator

/test ci/centos/upgrade-tests-cephfs

@ceph-csi-bot

ceph-csi-bot commented Feb 6, 2026

Copy link
Copy Markdown
Collaborator

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

@ceph-csi-bot

ceph-csi-bot commented Feb 6, 2026

Copy link
Copy Markdown
Collaborator

/test ci/centos/upgrade-tests-rbd

@ceph-csi-bot

ceph-csi-bot commented Feb 6, 2026

Copy link
Copy Markdown
Collaborator

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

@ceph-csi-bot

ceph-csi-bot commented Feb 6, 2026

Copy link
Copy Markdown
Collaborator

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

@ceph-csi-bot

ceph-csi-bot commented Feb 6, 2026

Copy link
Copy Markdown
Collaborator

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

@ceph-csi-bot

ceph-csi-bot commented Feb 6, 2026

Copy link
Copy Markdown
Collaborator

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

@ceph-csi-bot

ceph-csi-bot commented Feb 6, 2026

Copy link
Copy Markdown
Collaborator

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

@ceph-csi-bot

ceph-csi-bot commented Feb 6, 2026

Copy link
Copy Markdown
Collaborator

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

@ceph-csi-bot

ceph-csi-bot commented Feb 6, 2026

Copy link
Copy Markdown
Collaborator

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

@ceph-csi-bot

ceph-csi-bot commented Feb 6, 2026

Copy link
Copy Markdown
Collaborator

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

@ceph-csi-bot ceph-csi-bot removed the ok-to-test Label to trigger E2E tests label Feb 6, 2026
@mergify mergify Bot mentioned this pull request Feb 6, 2026
Merged
@mergify mergify Bot closed this Feb 6, 2026
@mergify mergify Bot deleted the mergify/merge-queue/29b6a6634e branch February 6, 2026 09:51
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 queued

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@ceph-csi-bot @nixpanic