Merge pull request #708 from GoogleCloudPlatform/gke/autopilot-issue-705

Fix #705
GoogleCloudPlatform · Jun 28, 2022 · aa9b01c · aa9b01c
2 parents 85081bd + add8fa5
commit aa9b01c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/modules/gke-cluster/main.tf b/modules/gke-cluster/main.tf
@@ -90,15 +90,15 @@ resource "google_container_cluster" "cluster" {
       auth     = var.addons.istio_config.tls ? "AUTH_MUTUAL_TLS" : "AUTH_NONE"
     }
     gce_persistent_disk_csi_driver_config {
-      enabled = var.addons.gce_persistent_disk_csi_driver_config
+      enabled = var.enable_autopilot || var.addons.gce_persistent_disk_csi_driver_config
     }
     dynamic "gcp_filestore_csi_driver_config" {
       # Pass the user-provided value when autopilot is disabled. When
       # autopilot is enabled, pass the value only when the addon is
       # set to true. This will fail but warns the user that autopilot
       # doesn't support this option, instead of silently discarding
       # and hiding the error
-      for_each = !var.enable_autopilot || (var.enable_autopilot && var.addons.gcp_filestore_csi_driver_config) ? [""] : []
+      for_each = var.enable_autopilot && !var.addons.gcp_filestore_csi_driver_config ? [] : [""]
       content {
         enabled = var.addons.gcp_filestore_csi_driver_config
       }