fix: Node Pool enable_gcfs true:false (#1976)

psiegmannyardi · apeabody · web-flow · commit 419078df92a8 · 2024-09-10T18:17:12.000-07:00
Co-authored-by: Andrew Peabody &lt;andrewpeabody@google.com&gt;
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -516,7 +516,7 @@ resource "google_container_cluster" "primary" {
       min_cpu_platform            = lookup(var.node_pools[0], "min_cpu_platform", "")
       enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
       dynamic "gcfs_config" {
-        for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : []
+        for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false]
         content {
           enabled = gcfs_config.value
         }
@@ -887,7 +887,7 @@ resource "google_container_node_pool" "windows_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] : []
+        for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
         content {
           enabled = gcfs_config.value
         }
diff --git a/cluster.tf b/cluster.tf
@@ -393,7 +393,7 @@ resource "google_container_cluster" "primary" {
       min_cpu_platform            = lookup(var.node_pools[0], "min_cpu_platform", "")
       enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
       dynamic "gcfs_config" {
-        for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : []
+        for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false]
         content {
           enabled = gcfs_config.value
         }
@@ -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] : []
+      for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
       content {
         enabled = gcfs_config.value
       }
@@ -875,7 +875,7 @@ resource "google_container_node_pool" "windows_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] : []
+      for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
       content {
         enabled = gcfs_config.value
       }
diff --git a/examples/simple_regional_with_ipv6/main.tf b/examples/simple_regional_with_ipv6/main.tf
@@ -27,7 +27,7 @@ provider "kubernetes" {
 }
 
 module "gke" {
-  source                 = "../../"
+  source                 = "terraform-google-modules/kubernetes-engine/google"
   project_id             = var.project_id
   name                   = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
   regional               = true
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -439,7 +439,7 @@ resource "google_container_cluster" "primary" {
       min_cpu_platform            = lookup(var.node_pools[0], "min_cpu_platform", "")
       enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
       dynamic "gcfs_config" {
-        for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : []
+        for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false]
         content {
           enabled = gcfs_config.value
         }
@@ -760,7 +760,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] : []
+      for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
       content {
         enabled = gcfs_config.value
       }
@@ -1056,7 +1056,7 @@ resource "google_container_node_pool" "windows_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] : []
+      for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
       content {
         enabled = gcfs_config.value
       }
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -439,7 +439,7 @@ resource "google_container_cluster" "primary" {
       min_cpu_platform            = lookup(var.node_pools[0], "min_cpu_platform", "")
       enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
       dynamic "gcfs_config" {
-        for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : []
+        for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false]
         content {
           enabled = gcfs_config.value
         }
@@ -678,7 +678,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] : []
+      for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
       content {
         enabled = gcfs_config.value
       }
@@ -973,7 +973,7 @@ resource "google_container_node_pool" "windows_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] : []
+      for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
       content {
         enabled = gcfs_config.value
       }
diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -439,7 +439,7 @@ resource "google_container_cluster" "primary" {
       min_cpu_platform            = lookup(var.node_pools[0], "min_cpu_platform", "")
       enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
       dynamic "gcfs_config" {
-        for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : []
+        for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false]
         content {
           enabled = gcfs_config.value
         }
@@ -739,7 +739,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] : []
+      for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
       content {
         enabled = gcfs_config.value
       }
@@ -1035,7 +1035,7 @@ resource "google_container_node_pool" "windows_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] : []
+      for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
       content {
         enabled = gcfs_config.value
       }
diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -439,7 +439,7 @@ resource "google_container_cluster" "primary" {
       min_cpu_platform            = lookup(var.node_pools[0], "min_cpu_platform", "")
       enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
       dynamic "gcfs_config" {
-        for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : []
+        for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false]
         content {
           enabled = gcfs_config.value
         }
@@ -657,7 +657,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] : []
+      for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
       content {
         enabled = gcfs_config.value
       }
@@ -952,7 +952,7 @@ resource "google_container_node_pool" "windows_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] : []
+      for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
       content {
         enabled = gcfs_config.value
       }
diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -393,7 +393,7 @@ resource "google_container_cluster" "primary" {
       min_cpu_platform            = lookup(var.node_pools[0], "min_cpu_platform", "")
       enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
       dynamic "gcfs_config" {
-        for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : []
+        for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false]
         content {
           enabled = gcfs_config.value
         }
@@ -696,7 +696,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] : []
+      for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
       content {
         enabled = gcfs_config.value
       }
@@ -979,7 +979,7 @@ resource "google_container_node_pool" "windows_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] : []
+      for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
       content {
         enabled = gcfs_config.value
       }
diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -393,7 +393,7 @@ resource "google_container_cluster" "primary" {
       min_cpu_platform            = lookup(var.node_pools[0], "min_cpu_platform", "")
       enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
       dynamic "gcfs_config" {
-        for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : []
+        for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false]
         content {
           enabled = gcfs_config.value
         }
@@ -614,7 +614,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] : []
+      for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
       content {
         enabled = gcfs_config.value
       }
@@ -896,7 +896,7 @@ resource "google_container_node_pool" "windows_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] : []
+      for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
       content {
         enabled = gcfs_config.value
       }
diff --git a/test/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json b/test/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json
@@ -210,6 +210,7 @@
       "config": {
         "diskSizeGb": 100,
         "diskType": "pd-standard",
+        "gcfsConfig": {},
         "imageType": "COS_CONTAINERD",
         "labels": {
           "cluster_name": "CLUSTER_NAME",

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ provider "kubernetes" {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`module "gke" {`
`30`		`- source = "../../"`
	`30`	`+ source = "terraform-google-modules/kubernetes-engine/google"`
`31`	`31`	`project_id = var.project_id`
`32`	`32`	`name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"`
`33`	`33`	`regional = true`