From c69bad1048bfade93583ac0e8acdad80bfc0af95 Mon Sep 17 00:00:00 2001
From: Nathaniel Ford <nathaniel.ford@gmail.com>
Date: Mon, 22 Sep 2025 20:29:25 +0000
Subject: [PATCH 1/2] 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 <nathaniel.ford@gmail.com>
Date: Mon, 22 Sep 2025 22:03:14 +0000
Subject: [PATCH 2/2] 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