fix: allow null enable_gcfs setting in defined nodepools

wyardley · wyardley · commit 42ce927c72bd · 2024-09-23T15:01:01.000-07:00
Fixes #2100 This basically replicates the fixes from #2093, #2095, but at the scope of implicitly defined nodepools.
diff --git a/cluster.tf b/cluster.tf
@@ -593,7 +593,7 @@ resource "google_container_node_pool" "pools" {
     min_cpu_platform            = lookup(each.value, "min_cpu_platform", "")
     enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
     dynamic "gcfs_config" {
-      for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
+      for_each = lookup(each.value, "enable_gcfs", null ) !=null ? [each.value.enable_gcfs] : []
       content {
         enabled = gcfs_config.value
       }

Original file line number	Diff line number	Diff line change
`@@ -593,7 +593,7 @@ resource "google_container_node_pool" "pools" {`
`593`	`593`	`min_cpu_platform = lookup(each.value, "min_cpu_platform", "")`
`594`	`594`	`enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)`
`595`	`595`	`dynamic "gcfs_config" {`
`596`		`- for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]`
	`596`	`+ for_each = lookup(each.value, "enable_gcfs", null ) !=null ? [each.value.enable_gcfs] : []`
`597`	`597`	`content {`
`598`	`598`	`enabled = gcfs_config.value`
`599`	`599`	`}`