From fca565c8fafcfeb7ae64fecc94be1558f98949df Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Thu, 26 Feb 2026 14:05:41 +0100 Subject: [PATCH] rebase: update csi-provisioner:v6.2.0 to support VolumeAttributesClass NFS supports changing the NFS-server hostname through VolumeAttributesClass on Kubernetes 1.35 and newer. The external-provisioner needs to annotate PVs with a reference to a Secret so that the external-resizer can update the requested parameters. The HonorPVReclaimPolicy feature-gate flag has been removed, the feature is GA since Kubernetes v1.33. There is no need to pass the flag anymore. See-also: kubernetes-csi/external-provisioner#1440 Signed-off-by: Niels de Vos --- build.env | 4 ++-- charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml | 1 - charts/ceph-csi-rbd/templates/provisioner-deployment.yaml | 1 - deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml | 1 - deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml | 1 - deploy/nvmeof/kubernetes/csi-nvmeofplugin-provisioner.yaml | 1 - deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml | 1 - 7 files changed, 2 insertions(+), 8 deletions(-) diff --git a/build.env b/build.env index 08a950965cf..829db8dc778 100644 --- a/build.env +++ b/build.env @@ -62,11 +62,11 @@ ROOK_VERSION=v1.18.4 ROOK_CEPH_CLUSTER_IMAGE=quay.io/ceph/ceph:v19.2.2 # CSI sidecar version -K8S_IMAGE_REPO=gcr.io/k8s-staging-sig-storage +K8S_IMAGE_REPO=registry.k8s.io/sig-storage CSI_ATTACHER_VERSION=v4.11.0 CSI_SNAPSHOTTER_VERSION=v8.5.0 CSI_RESIZER_VERSION=v2.1.0 -CSI_PROVISIONER_VERSION=v6.1.1 +CSI_PROVISIONER_VERSION=v6.2.0 CSI_NODE_DRIVER_REGISTRAR_VERSION=v2.16.0 # e2e settings diff --git a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml index 497b5d1da35..1841abbd649 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml @@ -150,7 +150,6 @@ spec: - "--leader-election=true" - "--retry-interval-start=500ms" - "--extra-create-metadata=true" - - "--feature-gates=HonorPVReclaimPolicy=true" - "--automaxprocs=true" - "--prevent-volume-mode-conversion=true" {{- if and .Values.provisioner.provisioner.args .Values.provisioner.provisioner.args.httpEndpointPort }} diff --git a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml index b8008f9c9d6..94680760bf0 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml @@ -163,7 +163,6 @@ spec: - "--retry-interval-start=500ms" - "--default-fstype={{ .Values.provisioner.defaultFSType }}" - "--extra-create-metadata=true" - - "--feature-gates=HonorPVReclaimPolicy=true" - "--automaxprocs=true" - "--prevent-volume-mode-conversion=true" - "--immediate-topology=false" diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml index 8488467ddd0..9de72f9eaf0 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml @@ -100,7 +100,6 @@ spec: - "--timeout=150s" - "--leader-election=true" - "--retry-interval-start=500ms" - - "--feature-gates=HonorPVReclaimPolicy=true" - "--prevent-volume-mode-conversion=true" - "--extra-create-metadata=true" - "--http-endpoint=$(POD_IP):8090" diff --git a/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml b/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml index ba4185ec659..efc3a11d4e0 100644 --- a/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml +++ b/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml @@ -80,7 +80,6 @@ spec: - "--timeout=150s" - "--leader-election=true" - "--retry-interval-start=500ms" - - "--feature-gates=HonorPVReclaimPolicy=true" - "--prevent-volume-mode-conversion=true" - "--http-endpoint=$(POD_IP):8090" env: diff --git a/deploy/nvmeof/kubernetes/csi-nvmeofplugin-provisioner.yaml b/deploy/nvmeof/kubernetes/csi-nvmeofplugin-provisioner.yaml index 69e0d61f349..230e346b171 100644 --- a/deploy/nvmeof/kubernetes/csi-nvmeofplugin-provisioner.yaml +++ b/deploy/nvmeof/kubernetes/csi-nvmeofplugin-provisioner.yaml @@ -86,7 +86,6 @@ spec: - "--timeout=150s" - "--retry-interval-start=500ms" - "--leader-election=true" - - "--feature-gates=HonorPVReclaimPolicy=true" - "--prevent-volume-mode-conversion=true" # if fstype is not specified in storageclass, ext4 is default - "--default-fstype=ext4" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml index b8b974cbbf7..090b4a40f3c 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml @@ -112,7 +112,6 @@ spec: - "--timeout=150s" - "--retry-interval-start=500ms" - "--leader-election=true" - - "--feature-gates=HonorPVReclaimPolicy=true" - "--prevent-volume-mode-conversion=true" # if fstype is not specified in storageclass, ext4 is default - "--default-fstype=ext4"