Merge pull request #5682 from ameukam/gke-enable-csi

k8s-ci-robot · web-flow · commit 5013b20ad7f4 · 2023-08-04T09:18:25.000-07:00
GKE: Enable GKE CSI driver
diff --git a/infra/gcp/terraform/kubernetes-public/10-cluster-configuration.tf b/infra/gcp/terraform/kubernetes-public/10-cluster-configuration.tf
@@ -159,6 +159,9 @@ resource "google_container_cluster" "cluster" {
 
   // Configure cluster addons
   addons_config {
+    gce_persistent_disk_csi_driver_config {
+      enabled = true
+    }
     horizontal_pod_autoscaling {
       disabled = false
     }
diff --git a/infra/gcp/terraform/modules/gke-cluster/main.tf b/infra/gcp/terraform/modules/gke-cluster/main.tf
@@ -161,6 +161,9 @@ resource "google_container_cluster" "prod_cluster" {
 
   // Configure cluster addons
   addons_config {
+    gce_persistent_disk_csi_driver_config {
+      enabled = true
+    }
     horizontal_pod_autoscaling {
       disabled = false
     }

Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,9 @@ resource "google_container_cluster" "cluster" {`
`159`	`159`
`160`	`160`	`// Configure cluster addons`
`161`	`161`	`addons_config {`
	`162`	`+ gce_persistent_disk_csi_driver_config {`
	`163`	`+ enabled = true`
	`164`	`+ }`
`162`	`165`	`horizontal_pod_autoscaling {`
`163`	`166`	`disabled = false`
`164`	`167`	`}`
Original file line number	Diff line number	Diff line change
`@@ -161,6 +161,9 @@ resource "google_container_cluster" "prod_cluster" {`
`161`	`161`
`162`	`162`	`// Configure cluster addons`
`163`	`163`	`addons_config {`
	`164`	`+ gce_persistent_disk_csi_driver_config {`
	`165`	`+ enabled = true`
	`166`	`+ }`
`164`	`167`	`horizontal_pod_autoscaling {`
`165`	`168`	`disabled = false`
`166`	`169`	`}`