Merge pull request #317 from kbst/fix-gcs-fuse-default

pst · web-flow · commit ca6a96353ee3 · 2023-08-16T19:31:32.000+02:00
Fix gcs fuse csi default false to null
diff --git a/google/_modules/gke/cluster.tf b/google/_modules/gke/cluster.tf
@@ -49,8 +49,12 @@ resource "google_container_cluster" "current" {
       disabled = false
     }
 
-    gcs_fuse_csi_driver_config {
-      enabled = var.enable_gcs_fuse_csi_driver
+    dynamic "gcs_fuse_csi_driver_config" {
+      for_each = var.enable_gcs_fuse_csi_driver != null ? [1] : []
+
+      content {
+        enabled = var.enable_gcs_fuse_csi_driver
+      }
     }
   }
 
diff --git a/google/cluster/configuration.tf b/google/cluster/configuration.tf
@@ -92,5 +92,5 @@ locals {
   monitoring_config_enable_components_lookup = lookup(local.cfg, "monitoring_config_enable_components", "SYSTEM_COMPONENTS")
   monitoring_config_enable_components        = compact(split(",", local.monitoring_config_enable_components_lookup))
 
-  enable_gcs_fuse_csi_driver = lookup(local.cfg, "enable_gcs_fuse_csi_driver", false)
+  enable_gcs_fuse_csi_driver = lookup(local.cfg, "enable_gcs_fuse_csi_driver", null)
 }

Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,12 @@ resource "google_container_cluster" "current" {`
`49`	`49`	`disabled = false`
`50`	`50`	`}`
`51`	`51`
`52`		`- gcs_fuse_csi_driver_config {`
`53`		`- enabled = var.enable_gcs_fuse_csi_driver`
	`52`	`+ dynamic "gcs_fuse_csi_driver_config" {`
	`53`	`+ for_each = var.enable_gcs_fuse_csi_driver != null ? [1] : []`
	`54`	`+`
	`55`	`+ content {`
	`56`	`+ enabled = var.enable_gcs_fuse_csi_driver`
	`57`	`+ }`
`54`	`58`	`}`
`55`	`59`	`}`
`56`	`60`
Original file line number	Diff line number	Diff line change
`@@ -92,5 +92,5 @@ locals {`
`92`	`92`	`monitoring_config_enable_components_lookup = lookup(local.cfg, "monitoring_config_enable_components", "SYSTEM_COMPONENTS")`
`93`	`93`	`monitoring_config_enable_components = compact(split(",", local.monitoring_config_enable_components_lookup))`
`94`	`94`
`95`		`- enable_gcs_fuse_csi_driver = lookup(local.cfg, "enable_gcs_fuse_csi_driver", false)`
	`95`	`+ enable_gcs_fuse_csi_driver = lookup(local.cfg, "enable_gcs_fuse_csi_driver", null)`
`96`	`96`	`}`