From c69bad1048bfade93583ac0e8acdad80bfc0af95 Mon Sep 17 00:00:00 2001 From: Nathaniel Ford Date: Mon, 22 Sep 2025 20:29:25 +0000 Subject: [PATCH 1/6] Move VAC api from v1beta1 to v1 Change-Id: I79888b0ecfb327ac9da788be6b1224c6699400c6 --- .../base/controller/controller.yaml | 6 ++--- examples/kubernetes/demo-vol-create.yaml | 24 +++++++++---------- test/k8s-integration/main.go | 2 -- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/deploy/kubernetes/base/controller/controller.yaml b/deploy/kubernetes/base/controller/controller.yaml index e15b8593a..1d4a46651 100644 --- a/deploy/kubernetes/base/controller/controller.yaml +++ b/deploy/kubernetes/base/controller/controller.yaml @@ -32,12 +32,11 @@ spec: - "--leader-election-namespace=$(PDCSI_NAMESPACE)" - "--timeout=250s" - "--extra-create-metadata" - # - "--run-controller-service=false" # disable the controller service of the CSI driver - # - "--run-node-service=false" # disable the node service of the CSI driver + # - "--run-controller-service=false" # disable the controller service of the CSI driver + # - "--run-node-service=false" # disable the node service of the CSI driver - "--leader-election" - "--default-fstype=ext4" - "--controller-publish-readonly=true" - - "--feature-gates=VolumeAttributesClass=true" env: - name: PDCSI_NAMESPACE valueFrom: @@ -96,7 +95,6 @@ spec: - "--leader-election" - "--leader-election-namespace=$(PDCSI_NAMESPACE)" - "--handle-volume-inuse-error=false" - - "--feature-gates=VolumeAttributesClass=true" env: - name: PDCSI_NAMESPACE valueFrom: diff --git a/examples/kubernetes/demo-vol-create.yaml b/examples/kubernetes/demo-vol-create.yaml index 5fa536042..cfa162d3d 100644 --- a/examples/kubernetes/demo-vol-create.yaml +++ b/examples/kubernetes/demo-vol-create.yaml @@ -9,7 +9,7 @@ parameters: provisioned-throughput-on-create: "150Mi" volumeBindingMode: WaitForFirstConsumer --- -apiVersion: storage.k8s.io/v1beta1 +apiVersion: storage.k8s.io/v1 kind: VolumeAttributesClass metadata: name: silver @@ -18,7 +18,7 @@ parameters: iops: "3000" throughput: "150Mi" --- -apiVersion: storage.k8s.io/v1beta1 +apiVersion: storage.k8s.io/v1 kind: VolumeAttributesClass metadata: name: gold @@ -46,14 +46,14 @@ metadata: name: nginx spec: volumes: - - name: vol - persistentVolumeClaim: - claimName: test-pvc + - name: vol + persistentVolumeClaim: + claimName: test-pvc containers: - - name: nginx - image: nginx:1.14.2 - ports: - - containerPort: 80 - volumeMounts: - - mountPath: "/vol" - name: vol \ No newline at end of file + - name: nginx + image: nginx:1.14.2 + ports: + - containerPort: 80 + volumeMounts: + - mountPath: "/vol" + name: vol diff --git a/test/k8s-integration/main.go b/test/k8s-integration/main.go index 80205785f..217789ab6 100644 --- a/test/k8s-integration/main.go +++ b/test/k8s-integration/main.go @@ -639,8 +639,6 @@ func generateGCETestSkip(testParams *testParameters) string { skipString := "\\[Disruptive\\]|\\[Serial\\]" // Skip mount options test until we fix the invalid mount options for xfs. skipString = skipString + "|csi-gcepd-sc-xfs.*provisioning.should.provision.storage.with.mount.options" - // Skip VolumeAttributesClass tests while it's a beta feature. - skipString = skipString + "|\\[Feature:VolumeAttributesClass\\]" v := apimachineryversion.MustParseSemantic(testParams.clusterVersion) From 1442d643ff5ecbe26fe03aaf9ab1ed4056acd2fc Mon Sep 17 00:00:00 2001 From: Nathaniel Ford Date: Mon, 22 Sep 2025 22:03:14 +0000 Subject: [PATCH 2/6] Fix autoformatting issue Change-Id: I2d78a565098a10fa8c64f6b4ea96f9397462d202 --- .../base/controller/controller.yaml | 4 ++-- examples/kubernetes/demo-vol-create.yaml | 20 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/deploy/kubernetes/base/controller/controller.yaml b/deploy/kubernetes/base/controller/controller.yaml index 1d4a46651..d783f9938 100644 --- a/deploy/kubernetes/base/controller/controller.yaml +++ b/deploy/kubernetes/base/controller/controller.yaml @@ -32,8 +32,8 @@ spec: - "--leader-election-namespace=$(PDCSI_NAMESPACE)" - "--timeout=250s" - "--extra-create-metadata" - # - "--run-controller-service=false" # disable the controller service of the CSI driver - # - "--run-node-service=false" # disable the node service of the CSI driver + # - "--run-controller-service=false" # disable the controller service of the CSI driver + # - "--run-node-service=false" # disable the node service of the CSI driver - "--leader-election" - "--default-fstype=ext4" - "--controller-publish-readonly=true" diff --git a/examples/kubernetes/demo-vol-create.yaml b/examples/kubernetes/demo-vol-create.yaml index cfa162d3d..82e12b569 100644 --- a/examples/kubernetes/demo-vol-create.yaml +++ b/examples/kubernetes/demo-vol-create.yaml @@ -46,14 +46,14 @@ metadata: name: nginx spec: volumes: - - name: vol - persistentVolumeClaim: - claimName: test-pvc + - name: vol + persistentVolumeClaim: + claimName: test-pvc containers: - - name: nginx - image: nginx:1.14.2 - ports: - - containerPort: 80 - volumeMounts: - - mountPath: "/vol" - name: vol + - name: nginx + image: nginx:1.14.2 + ports: + - containerPort: 80 + volumeMounts: + - mountPath: "/vol" + name: vol From 651a2f806619656e313a744d05c9fd0cebad8f88 Mon Sep 17 00:00:00 2001 From: Nathaniel Ford Date: Mon, 13 Oct 2025 20:09:18 +0000 Subject: [PATCH 3/6] Update README to include k8s 1.34 rec Change-Id: I54b2ee7796207d56e05f92c793c3e4fe0073e946 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b1038cc8b..d0c1035ea 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,7 @@ versions. | Kubernetes Version | PD CSI Driver Version | |--------------------|-----------------------| | HEAD | v1.13.x | +| 1.34 | v1.13.x | | 1.29 | v1.12.x | | 1.28 | v1.12.x | | 1.27 | v1.10.x | From 7e1573de51f249cabe5e4422f83ddcaea2e47f40 Mon Sep 17 00:00:00 2001 From: Nathaniel Ford Date: Tue, 14 Oct 2025 17:32:21 +0000 Subject: [PATCH 4/6] Remove autoformatting error Change-Id: I71f4d77902762735fd110daae4459785a3ca7095 --- examples/kubernetes/demo-vol-create.yaml | 6 +++--- test/k8s-integration/main.go | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/examples/kubernetes/demo-vol-create.yaml b/examples/kubernetes/demo-vol-create.yaml index 82e12b569..8d4c28a1b 100644 --- a/examples/kubernetes/demo-vol-create.yaml +++ b/examples/kubernetes/demo-vol-create.yaml @@ -53,7 +53,7 @@ spec: - name: nginx image: nginx:1.14.2 ports: - - containerPort: 80 + - containerPort: 80 volumeMounts: - - mountPath: "/vol" - name: vol + - mountPath: "/vol" + name: vol diff --git a/test/k8s-integration/main.go b/test/k8s-integration/main.go index 217789ab6..b84727503 100644 --- a/test/k8s-integration/main.go +++ b/test/k8s-integration/main.go @@ -745,8 +745,6 @@ func generateGKETestSkip(testParams *testParameters) string { // Skip mount options test until we fix the invalid mount options for xfs. skipString = skipString + "|csi-gcepd-sc-xfs.*provisioning.should.provision.storage.with.mount.options" - // Skip VolumeAttributesClass tests while it's a beta feature. - skipString = skipString + "|\\[Feature:VolumeAttributesClass\\]" // Skip rwop test when node version is less than 1.32. Test was added only // in 1.32 and above, see tags in From 2bc30470d3ce3a6c2201aa5a0c8a5b352f7672c1 Mon Sep 17 00:00:00 2001 From: Nathaniel Ford Date: Tue, 28 Oct 2025 03:36:20 +0000 Subject: [PATCH 5/6] Rev resizer and provisioner versions to the VAC-supporting tag Change-Id: Ibce622652329f208be6a369de69708005f44c36d --- deploy/kubernetes/images/stable-master/image.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/kubernetes/images/stable-master/image.yaml b/deploy/kubernetes/images/stable-master/image.yaml index b0da81d85..81a60ae22 100644 --- a/deploy/kubernetes/images/stable-master/image.yaml +++ b/deploy/kubernetes/images/stable-master/image.yaml @@ -4,7 +4,7 @@ metadata: name: imagetag-csi-provisioner imageTag: name: registry.k8s.io/sig-storage/csi-provisioner - newTag: "v5.2.0" + newTag: "v6.0.0" --- apiVersion: builtin kind: ImageTagTransformer @@ -20,7 +20,7 @@ metadata: name: imagetag-csi-resizer imageTag: name: registry.k8s.io/sig-storage/csi-resizer - newTag: "v1.13.2" + newTag: "v2.0.0" --- apiVersion: builtin kind: ImageTagTransformer From 45608b00a95becbd54db6cc33679ec2cb347b01c Mon Sep 17 00:00:00 2001 From: Nathaniel Ford Date: Wed, 29 Oct 2025 17:19:43 +0000 Subject: [PATCH 6/6] Remove VAC feature gate flag from test Change-Id: I89e16dd4c1b15b60210a3ed5099290529379728c --- test/run-k8s-integration-ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/run-k8s-integration-ci.sh b/test/run-k8s-integration-ci.sh index 46fbd4fc9..d1a4be8a1 100755 --- a/test/run-k8s-integration-ci.sh +++ b/test/run-k8s-integration-ci.sh @@ -124,7 +124,7 @@ else fi if [ "$test_volumeattributesclass" = true ]; then - base_cmd="${base_cmd} --volumeattributesclass-files=hdb-volumeattributesclass.yaml --storageclass-for-vac-file=sc-hdb.yaml --kube-runtime-config=api/all=true" + base_cmd="${base_cmd} --volumeattributesclass-files=hdb-volumeattributesclass.yaml --storageclass-for-vac-file=sc-hdb.yaml" if [ "$deployment_strategy" = "gce" ]; then base_cmd="${base_cmd} --kube-feature-gates=VolumeAttributesClass=true" fi