fix: convert gcfs_config to dynamic block to prevent node pool recrea…

…tion
terraform-google-modules · May 17, 2022 · 81686e7 · 81686e7
1 parent aee12e7
commit 81686e7
Show file tree

Hide file tree

Showing 8 changed files with 80 additions and 32 deletions.
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -295,8 +295,11 @@ resource "google_container_cluster" "primary" {
       image_type       = lookup(var.node_pools[0], "image_type", "COS_CONTAINERD")
       machine_type     = lookup(var.node_pools[0], "machine_type", "e2-medium")
       min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
-      gcfs_config {
-        enabled = lookup(var.node_pools[0], "enable_gcfs", false)
+      dynamic "gcfs_config" {
+        for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : []
+        content {
+          enabled = gcfs_config.value
+        }
       }
 
       service_account = lookup(var.node_pools[0], "service_account", local.service_account)
@@ -580,8 +583,11 @@ resource "google_container_node_pool" "pools" {
     image_type       = lookup(each.value, "image_type", "COS_CONTAINERD")
     machine_type     = lookup(each.value, "machine_type", "e2-medium")
     min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
-    gcfs_config {
-      enabled = lookup(each.value, "enable_gcfs", false)
+    dynamic "gcfs_config" {
+        for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
+        content {
+          enabled = gcfs_config.value
+        }
     }
     labels = merge(
       lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},

diff --git a/cluster.tf b/cluster.tf
@@ -146,8 +146,11 @@ resource "google_container_cluster" "primary" {
       image_type       = lookup(var.node_pools[0], "image_type", "COS_CONTAINERD")
       machine_type     = lookup(var.node_pools[0], "machine_type", "e2-medium")
       min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
-      gcfs_config {
-        enabled = lookup(var.node_pools[0], "enable_gcfs", false)
+      dynamic "gcfs_config" {
+        for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : []
+        content {
+          enabled = gcfs_config.value
+        }
       }
 
       service_account = lookup(var.node_pools[0], "service_account", local.service_account)
@@ -269,8 +272,11 @@ resource "google_container_node_pool" "pools" {
     image_type       = lookup(each.value, "image_type", "COS_CONTAINERD")
     machine_type     = lookup(each.value, "machine_type", "e2-medium")
     min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
-    gcfs_config {
-      enabled = lookup(each.value, "enable_gcfs", false)
+    dynamic "gcfs_config" {
+      for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
+      content {
+        enabled = gcfs_config.value
+      }
     }
     labels = merge(
       lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},

diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -252,8 +252,11 @@ resource "google_container_cluster" "primary" {
       image_type       = lookup(var.node_pools[0], "image_type", "COS_CONTAINERD")
       machine_type     = lookup(var.node_pools[0], "machine_type", "e2-medium")
       min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
-      gcfs_config {
-        enabled = lookup(var.node_pools[0], "enable_gcfs", false)
+      dynamic "gcfs_config" {
+        for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : []
+        content {
+          enabled = gcfs_config.value
+        }
       }
 
       service_account = lookup(var.node_pools[0], "service_account", local.service_account)
@@ -505,8 +508,11 @@ resource "google_container_node_pool" "pools" {
     image_type       = lookup(each.value, "image_type", "COS_CONTAINERD")
     machine_type     = lookup(each.value, "machine_type", "e2-medium")
     min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
-    gcfs_config {
-      enabled = lookup(each.value, "enable_gcfs", false)
+    dynamic "gcfs_config" {
+      for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
+      content {
+        enabled = gcfs_config.value
+      }
     }
     labels = merge(
       lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},

diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -252,8 +252,11 @@ resource "google_container_cluster" "primary" {
       image_type       = lookup(var.node_pools[0], "image_type", "COS_CONTAINERD")
       machine_type     = lookup(var.node_pools[0], "machine_type", "e2-medium")
       min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
-      gcfs_config {
-        enabled = lookup(var.node_pools[0], "enable_gcfs", false)
+      dynamic "gcfs_config" {
+        for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : []
+        content {
+          enabled = gcfs_config.value
+        }
       }
 
       service_account = lookup(var.node_pools[0], "service_account", local.service_account)
@@ -418,8 +421,11 @@ resource "google_container_node_pool" "pools" {
     image_type       = lookup(each.value, "image_type", "COS_CONTAINERD")
     machine_type     = lookup(each.value, "machine_type", "e2-medium")
     min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
-    gcfs_config {
-      enabled = lookup(each.value, "enable_gcfs", false)
+    dynamic "gcfs_config" {
+      for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
+      content {
+        enabled = gcfs_config.value
+      }
     }
     labels = merge(
       lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},

diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -252,8 +252,11 @@ resource "google_container_cluster" "primary" {
       image_type       = lookup(var.node_pools[0], "image_type", "COS_CONTAINERD")
       machine_type     = lookup(var.node_pools[0], "machine_type", "e2-medium")
       min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
-      gcfs_config {
-        enabled = lookup(var.node_pools[0], "enable_gcfs", false)
+      dynamic "gcfs_config" {
+        for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : []
+        content {
+          enabled = gcfs_config.value
+        }
       }
 
       service_account = lookup(var.node_pools[0], "service_account", local.service_account)
@@ -486,8 +489,11 @@ resource "google_container_node_pool" "pools" {
     image_type       = lookup(each.value, "image_type", "COS_CONTAINERD")
     machine_type     = lookup(each.value, "machine_type", "e2-medium")
     min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
-    gcfs_config {
-      enabled = lookup(each.value, "enable_gcfs", false)
+    dynamic "gcfs_config" {
+      for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
+      content {
+        enabled = gcfs_config.value
+      }
     }
     labels = merge(
       lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},

diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -252,8 +252,11 @@ resource "google_container_cluster" "primary" {
       image_type       = lookup(var.node_pools[0], "image_type", "COS_CONTAINERD")
       machine_type     = lookup(var.node_pools[0], "machine_type", "e2-medium")
       min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
-      gcfs_config {
-        enabled = lookup(var.node_pools[0], "enable_gcfs", false)
+      dynamic "gcfs_config" {
+        for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : []
+        content {
+          enabled = gcfs_config.value
+        }
       }
 
       service_account = lookup(var.node_pools[0], "service_account", local.service_account)
@@ -399,8 +402,11 @@ resource "google_container_node_pool" "pools" {
     image_type       = lookup(each.value, "image_type", "COS_CONTAINERD")
     machine_type     = lookup(each.value, "machine_type", "e2-medium")
     min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
-    gcfs_config {
-      enabled = lookup(each.value, "enable_gcfs", false)
+    dynamic "gcfs_config" {
+      for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
+      content {
+        enabled = gcfs_config.value
+      }
     }
     labels = merge(
       lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},

diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -146,8 +146,11 @@ resource "google_container_cluster" "primary" {
       image_type       = lookup(var.node_pools[0], "image_type", "COS_CONTAINERD")
       machine_type     = lookup(var.node_pools[0], "machine_type", "e2-medium")
       min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
-      gcfs_config {
-        enabled = lookup(var.node_pools[0], "enable_gcfs", false)
+      dynamic "gcfs_config" {
+        for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : []
+        content {
+          enabled = gcfs_config.value
+        }
       }
 
       service_account = lookup(var.node_pools[0], "service_account", local.service_account)
@@ -368,8 +371,11 @@ resource "google_container_node_pool" "pools" {
     image_type       = lookup(each.value, "image_type", "COS_CONTAINERD")
     machine_type     = lookup(each.value, "machine_type", "e2-medium")
     min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
-    gcfs_config {
-      enabled = lookup(each.value, "enable_gcfs", false)
+    dynamic "gcfs_config" {
+      for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
+      content {
+        enabled = gcfs_config.value
+      }
     }
     labels = merge(
       lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},

diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -146,8 +146,11 @@ resource "google_container_cluster" "primary" {
       image_type       = lookup(var.node_pools[0], "image_type", "COS_CONTAINERD")
       machine_type     = lookup(var.node_pools[0], "machine_type", "e2-medium")
       min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
-      gcfs_config {
-        enabled = lookup(var.node_pools[0], "enable_gcfs", false)
+      dynamic "gcfs_config" {
+        for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : []
+        content {
+          enabled = gcfs_config.value
+        }
       }
 
       service_account = lookup(var.node_pools[0], "service_account", local.service_account)
@@ -282,8 +285,11 @@ resource "google_container_node_pool" "pools" {
     image_type       = lookup(each.value, "image_type", "COS_CONTAINERD")
     machine_type     = lookup(each.value, "machine_type", "e2-medium")
     min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
-    gcfs_config {
-      enabled = lookup(each.value, "enable_gcfs", false)
+    dynamic "gcfs_config" {
+      for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
+      content {
+        enabled = gcfs_config.value
+      }
     }
     labels = merge(
       lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},