Patch as enabling topology instead of disabling topology

Author: msau42

deploy/kubernetes/base/controller.yaml

@@ -20,7 +20,6 @@ spec:
           args:
             - "--v=5"
             - "--csi-address=/csi/csi.sock"
-            - "--feature-gates=Topology=true"
           volumeMounts:
             - name: socket-dir
               mountPath: /csi

deploy/kubernetes/overlays/stable/controller_disable_topology.yaml renamed to deploy/kubernetes/overlays/alpha/controller_enable_topology.yaml

@@ -10,3 +10,4 @@ spec:
           args:
             - "--v=5"
             - "--csi-address=/csi/csi.sock"
+            - "--feature-gates=Topology=true"

deploy/kubernetes/overlays/alpha/kustomization.yaml

@@ -4,6 +4,7 @@ bases:
 - ../stable
 patches:
 - controller_add_snapshotter.yaml
+- controller_enable_topology.yaml
 patchesJson6902:
 - target:
     group: rbac.authorization.k8s.io

deploy/kubernetes/overlays/prow-gke-release-staging-head/controller_enable_topology.yaml

@@ -0,0 +1,13 @@
+kind: StatefulSet
+apiVersion: apps/v1
+metadata:
+  name: csi-gce-pd-controller
+spec:
+  template:
+    spec:
+      containers:
+        - name: csi-provisioner
+          args:
+            - "--v=5"
+            - "--csi-address=/csi/csi.sock"
+            - "--feature-gates=Topology=true"

deploy/kubernetes/overlays/prow-gke-release-staging-head/kustomization.yaml

@@ -2,6 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 bases:
 - ../../base
+patches:
+- controller_enable_topology.yaml
 images:
 - name: REPLACEME/gcp-compute-persistent-disk-csi-driver
   newName: gcr.io/gke-release-staging/gcp-compute-persistent-disk-csi-driver

deploy/kubernetes/overlays/prow-gke-release-staging-rc/controller_enable_topology.yaml

@@ -0,0 +1,13 @@
+kind: StatefulSet
+apiVersion: apps/v1
+metadata:
+  name: csi-gce-pd-controller
+spec:
+  template:
+    spec:
+      containers:
+        - name: csi-provisioner
+          args:
+            - "--v=5"
+            - "--csi-address=/csi/csi.sock"
+            - "--feature-gates=Topology=true"

deploy/kubernetes/overlays/prow-gke-release-staging-rc/kustomization.yaml

@@ -2,6 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 bases:
 - ../../base
+patches:
+- controller_enable_topology.yaml
 images:
 - name: REPLACEME/gcp-compute-persistent-disk-csi-driver
   newName: gcr.io/gke-release-staging/gcp-compute-persistent-disk-csi-driver

deploy/kubernetes/overlays/stable/kustomization.yaml

@@ -2,8 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 bases:
 - ../../base
-patches:
-- controller_disable_topology.yaml
 images:
 - name: REPLACEME/gcp-compute-persistent-disk-csi-driver
   newName: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver