From b996c7661dc92c15828ec8f846871112014b9ee2 Mon Sep 17 00:00:00 2001
From: Travis Xiang <travisx@google.com>
Date: Wed, 25 Sep 2024 17:59:04 +0000
Subject: [PATCH 1/2] Enable VolumeAttributesClass feature gate for CI runs

---
 .../prow-stable-sidecar-rc-master/driver-args.yaml         | 7 -------
 .../prow-stable-sidecar-rc-master/kustomization.yaml       | 6 ------
 test/run-k8s-integration-ci.sh                             | 3 +++
 3 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 deploy/kubernetes/overlays/prow-stable-sidecar-rc-master/driver-args.yaml

diff --git a/deploy/kubernetes/overlays/prow-stable-sidecar-rc-master/driver-args.yaml b/deploy/kubernetes/overlays/prow-stable-sidecar-rc-master/driver-args.yaml
deleted file mode 100644
index b3b858d58..000000000
--- a/deploy/kubernetes/overlays/prow-stable-sidecar-rc-master/driver-args.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-- op: add
-  path: /spec/template/spec/containers/4/args/-
-  value: --supports-dynamic-throughput-provisioning=hyperdisk-balanced,hyperdisk-throughput,hyperdisk-ml
-
-- op: add
-  path: /spec/template/spec/containers/4/args/-
-  value: --supports-dynamic-iops-provisioning=hyperdisk-balanced,hyperdisk-extreme
\ No newline at end of file
diff --git a/deploy/kubernetes/overlays/prow-stable-sidecar-rc-master/kustomization.yaml b/deploy/kubernetes/overlays/prow-stable-sidecar-rc-master/kustomization.yaml
index 0d99a52cf..2063caa67 100644
--- a/deploy/kubernetes/overlays/prow-stable-sidecar-rc-master/kustomization.yaml
+++ b/deploy/kubernetes/overlays/prow-stable-sidecar-rc-master/kustomization.yaml
@@ -24,11 +24,5 @@ patchesJson6902:
     kind: Deployment
     name: csi-gce-pd-controller
     version: v1
-- path: driver-args.yaml
-  target:
-    group: apps
-    kind: Deployment
-    name: csi-gce-pd-controller
-    version: v1
 transformers:
 - ../../images/prow-stable-sidecar-rc-master
diff --git a/test/run-k8s-integration-ci.sh b/test/run-k8s-integration-ci.sh
index c9280498e..67a75c041 100755
--- a/test/run-k8s-integration-ci.sh
+++ b/test/run-k8s-integration-ci.sh
@@ -120,6 +120,9 @@ 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"
+  if [ "$deployment_strategy" = "gce" ]; then
+    base_cmd="${base_cmd} --kube-feature-gates=VolumeAttributesClass=true"
+  fi
 fi
 
 eval "$base_cmd"

From 9358d568739bc72f7229cdafe024e1251c63dcfd Mon Sep 17 00:00:00 2001
From: Travis Xiang <travisx@google.com>
Date: Wed, 25 Sep 2024 21:34:06 +0000
Subject: [PATCH 2/2] Replace ControllerModifyVolume with VolumeAttributesClass
 in the user guide

---
 ...controller-modify-volume.md => volume-attributes-class.md} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename docs/kubernetes/user-guides/{controller-modify-volume.md => volume-attributes-class.md} (96%)

diff --git a/docs/kubernetes/user-guides/controller-modify-volume.md b/docs/kubernetes/user-guides/volume-attributes-class.md
similarity index 96%
rename from docs/kubernetes/user-guides/controller-modify-volume.md
rename to docs/kubernetes/user-guides/volume-attributes-class.md
index 8f099680c..616231250 100644
--- a/docs/kubernetes/user-guides/controller-modify-volume.md
+++ b/docs/kubernetes/user-guides/volume-attributes-class.md
@@ -1,8 +1,8 @@
-# ControllerModifyVolume User Guide
+# VolumeAttributesClass User Guide
 
 >**Attention:** VolumeAttributesClass is a Kubernetes Beta feature since v1.31, but was initially introduced as an alpha feature in v1.29. See [this blog post](https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/) for more information on VolumeAttributesClasses and how to enable the feature gate.
 
-### ControllerModifyVolume Example
+### VolumeAttributesClass Example
 
 This example provisions a hyperdisk-balanced and then updates its IOPS and throughput.