Preventing node-pool recreting if switching from regular to beta module

marko7460 · marko7460 · commit 589e7c933a9e · 2019-07-03T13:03:21.000-07:00
diff --git a/autogen/cluster_regional.tf b/autogen/cluster_regional.tf
@@ -107,9 +107,7 @@ resource "google_container_cluster" "primary" {
     node_config {
       service_account = "${lookup(var.node_pools[0], "service_account", local.service_account)}"
       {% if beta_cluster %}
-      workload_metadata_config {
-        node_metadata = "${var.node_metadata}"
-      }
+      workload_metadata_config = "${local.cluster_node_metadata_config["${var.node_metadata == "UNSPECIFIED" ? "unspecified" : "specified"}"]}"
       {% endif %}
     }
   }
@@ -175,9 +173,7 @@ resource "google_container_node_pool" "pools" {
     }
     {% if beta_cluster %}
 
-    workload_metadata_config {
-      node_metadata = "${var.node_metadata}"
-    }
+    workload_metadata_config = "${local.cluster_node_metadata_config["${var.node_metadata == "UNSPECIFIED" ? "unspecified" : "specified"}"]}"
     {% endif %}
   }
 
diff --git a/autogen/cluster_zonal.tf b/autogen/cluster_zonal.tf
@@ -108,9 +108,7 @@ resource "google_container_cluster" "zonal_primary" {
     node_config {
       service_account = "${lookup(var.node_pools[0], "service_account", local.service_account)}"
       {% if beta_cluster %}
-      workload_metadata_config {
-        node_metadata = "${var.node_metadata}"
-      }
+      workload_metadata_config = "${local.cluster_node_metadata_config["${var.node_metadata == "UNSPECIFIED" ? "unspecified" : "specified"}"]}"
       {% endif %}
     }
   }
@@ -176,9 +174,7 @@ resource "google_container_node_pool" "zonal_pools" {
     }
     {% if beta_cluster %}
 
-    workload_metadata_config {
-      node_metadata = "${var.node_metadata}"
-    }
+    workload_metadata_config = "${local.cluster_node_metadata_config["${var.node_metadata == "UNSPECIFIED" ? "unspecified" : "specified"}"]}"
     {% endif %}
   }
 
diff --git a/autogen/main.tf b/autogen/main.tf
@@ -52,7 +52,14 @@ locals {
     enabled  = [{disabled = "false"}]
     disabled = []
   }
+{% if beta_cluster %}
+
+  cluster_node_metadata_config = {
+    specified   = [{node_metadata = "${var.node_metadata}"}]
+    unspecified = []
+  }
 
+{% endif %}
   cluster_type_output_name = {
     regional = "${element(concat(google_container_cluster.primary.*.name, list("")), 0)}"
     zonal    = "${element(concat(google_container_cluster.zonal_primary.*.name, list("")), 0)}"
diff --git a/modules/beta-private-cluster/cluster_regional.tf b/modules/beta-private-cluster/cluster_regional.tf
@@ -102,9 +102,7 @@ resource "google_container_cluster" "primary" {
 
     node_config {
       service_account = "${lookup(var.node_pools[0], "service_account", local.service_account)}"
-      workload_metadata_config {
-        node_metadata = "${var.node_metadata}"
-      }
+      workload_metadata_config = "${local.cluster_node_metadata_config["${var.node_metadata == "UNSPECIFIED" ? "unspecified" : "specified"}"]}"
     }
   }
 
@@ -164,9 +162,7 @@ resource "google_container_node_pool" "pools" {
       count = "${lookup(var.node_pools[count.index], "accelerator_count", 0)}"
     }
 
-    workload_metadata_config {
-      node_metadata = "${var.node_metadata}"
-    }
+    workload_metadata_config = "${local.cluster_node_metadata_config["${var.node_metadata == "UNSPECIFIED" ? "unspecified" : "specified"}"]}"
   }
 
   lifecycle {
diff --git a/modules/beta-private-cluster/cluster_zonal.tf b/modules/beta-private-cluster/cluster_zonal.tf
@@ -103,9 +103,7 @@ resource "google_container_cluster" "zonal_primary" {
 
     node_config {
       service_account = "${lookup(var.node_pools[0], "service_account", local.service_account)}"
-      workload_metadata_config {
-        node_metadata = "${var.node_metadata}"
-      }
+      workload_metadata_config = "${local.cluster_node_metadata_config["${var.node_metadata == "UNSPECIFIED" ? "unspecified" : "specified"}"]}"
     }
   }
 
@@ -165,9 +163,7 @@ resource "google_container_node_pool" "zonal_pools" {
       count = "${lookup(var.node_pools[count.index], "accelerator_count", 0)}"
     }
 
-    workload_metadata_config {
-      node_metadata = "${var.node_metadata}"
-    }
+    workload_metadata_config = "${local.cluster_node_metadata_config["${var.node_metadata == "UNSPECIFIED" ? "unspecified" : "specified"}"]}"
   }
 
   lifecycle {
diff --git a/modules/beta-private-cluster/main.tf b/modules/beta-private-cluster/main.tf
@@ -59,6 +59,14 @@ locals {
     disabled = []
   }
 
+  cluster_node_metadata_config = {
+    specified = [{
+      node_metadata = "${var.node_metadata}"
+    }]
+
+    unspecified = []
+  }
+
   cluster_type_output_name = {
     regional = "${element(concat(google_container_cluster.primary.*.name, list("")), 0)}"
     zonal    = "${element(concat(google_container_cluster.zonal_primary.*.name, list("")), 0)}"
diff --git a/modules/beta-public-cluster/cluster_regional.tf b/modules/beta-public-cluster/cluster_regional.tf
@@ -102,9 +102,7 @@ resource "google_container_cluster" "primary" {
 
     node_config {
       service_account = "${lookup(var.node_pools[0], "service_account", local.service_account)}"
-      workload_metadata_config {
-        node_metadata = "${var.node_metadata}"
-      }
+      workload_metadata_config = "${local.cluster_node_metadata_config["${var.node_metadata == "UNSPECIFIED" ? "unspecified" : "specified"}"]}"
     }
   }
 
@@ -158,9 +156,7 @@ resource "google_container_node_pool" "pools" {
       count = "${lookup(var.node_pools[count.index], "accelerator_count", 0)}"
     }
 
-    workload_metadata_config {
-      node_metadata = "${var.node_metadata}"
-    }
+    workload_metadata_config = "${local.cluster_node_metadata_config["${var.node_metadata == "UNSPECIFIED" ? "unspecified" : "specified"}"]}"
   }
 
   lifecycle {
diff --git a/modules/beta-public-cluster/cluster_zonal.tf b/modules/beta-public-cluster/cluster_zonal.tf
@@ -103,9 +103,7 @@ resource "google_container_cluster" "zonal_primary" {
 
     node_config {
       service_account = "${lookup(var.node_pools[0], "service_account", local.service_account)}"
-      workload_metadata_config {
-        node_metadata = "${var.node_metadata}"
-      }
+      workload_metadata_config = "${local.cluster_node_metadata_config["${var.node_metadata == "UNSPECIFIED" ? "unspecified" : "specified"}"]}"
     }
   }
 
@@ -159,9 +157,7 @@ resource "google_container_node_pool" "zonal_pools" {
       count = "${lookup(var.node_pools[count.index], "accelerator_count", 0)}"
     }
 
-    workload_metadata_config {
-      node_metadata = "${var.node_metadata}"
-    }
+    workload_metadata_config = "${local.cluster_node_metadata_config["${var.node_metadata == "UNSPECIFIED" ? "unspecified" : "specified"}"]}"
   }
 
   lifecycle {
diff --git a/modules/beta-public-cluster/main.tf b/modules/beta-public-cluster/main.tf
@@ -59,6 +59,14 @@ locals {
     disabled = []
   }
 
+  cluster_node_metadata_config = {
+    specified = [{
+      node_metadata = "${var.node_metadata}"
+    }]
+
+    unspecified = []
+  }
+
   cluster_type_output_name = {
     regional = "${element(concat(google_container_cluster.primary.*.name, list("")), 0)}"
     zonal    = "${element(concat(google_container_cluster.zonal_primary.*.name, list("")), 0)}"

Original file line number	Diff line number	Diff line change
`@@ -107,9 +107,7 @@ resource "google_container_cluster" "primary" {`
`107`	`107`	`node_config {`
`108`	`108`	`service_account = "${lookup(var.node_pools[0], "service_account", local.service_account)}"`
`109`	`109`	`{% if beta_cluster %}`
`110`		`- workload_metadata_config {`
`111`		`- node_metadata = "${var.node_metadata}"`
`112`		`- }`
	`110`	`+ workload_metadata_config = "${local.cluster_node_metadata_config["${var.node_metadata == "UNSPECIFIED" ? "unspecified" : "specified"}"]}"`
`113`	`111`	`{% endif %}`
`114`	`112`	`}`
`115`	`113`	`}`
`@@ -175,9 +173,7 @@ resource "google_container_node_pool" "pools" {`
`175`	`173`	`}`
`176`	`174`	`{% if beta_cluster %}`
`177`	`175`
`178`		`- workload_metadata_config {`
`179`		`- node_metadata = "${var.node_metadata}"`
`180`		`- }`
	`176`	`+ workload_metadata_config = "${local.cluster_node_metadata_config["${var.node_metadata == "UNSPECIFIED" ? "unspecified" : "specified"}"]}"`
`181`	`177`	`{% endif %}`
`182`	`178`	`}`
`183`	`179`
Original file line number	Diff line number	Diff line change
`@@ -108,9 +108,7 @@ resource "google_container_cluster" "zonal_primary" {`
`108`	`108`	`node_config {`
`109`	`109`	`service_account = "${lookup(var.node_pools[0], "service_account", local.service_account)}"`
`110`	`110`	`{% if beta_cluster %}`
`111`		`- workload_metadata_config {`
`112`		`- node_metadata = "${var.node_metadata}"`
`113`		`- }`
	`111`	`+ workload_metadata_config = "${local.cluster_node_metadata_config["${var.node_metadata == "UNSPECIFIED" ? "unspecified" : "specified"}"]}"`
`114`	`112`	`{% endif %}`
`115`	`113`	`}`
`116`	`114`	`}`
`@@ -176,9 +174,7 @@ resource "google_container_node_pool" "zonal_pools" {`
`176`	`174`	`}`
`177`	`175`	`{% if beta_cluster %}`
`178`	`176`
`179`		`- workload_metadata_config {`
`180`		`- node_metadata = "${var.node_metadata}"`
`181`		`- }`
	`177`	`+ workload_metadata_config = "${local.cluster_node_metadata_config["${var.node_metadata == "UNSPECIFIED" ? "unspecified" : "specified"}"]}"`
`182`	`178`	`{% endif %}`
`183`	`179`	`}`
`184`	`180`
Original file line number	Diff line number	Diff line change
`@@ -102,9 +102,7 @@ resource "google_container_cluster" "primary" {`
`102`	`102`
`103`	`103`	`node_config {`
`104`	`104`	`service_account = "${lookup(var.node_pools[0], "service_account", local.service_account)}"`
`105`		`- workload_metadata_config {`
`106`		`- node_metadata = "${var.node_metadata}"`
`107`		`- }`
	`105`	`+ workload_metadata_config = "${local.cluster_node_metadata_config["${var.node_metadata == "UNSPECIFIED" ? "unspecified" : "specified"}"]}"`
`108`	`106`	`}`
`109`	`107`	`}`
`110`	`108`
`@@ -164,9 +162,7 @@ resource "google_container_node_pool" "pools" {`
`164`	`162`	`count = "${lookup(var.node_pools[count.index], "accelerator_count", 0)}"`
`165`	`163`	`}`
`166`	`164`
`167`		`- workload_metadata_config {`
`168`		`- node_metadata = "${var.node_metadata}"`
`169`		`- }`
	`165`	`+ workload_metadata_config = "${local.cluster_node_metadata_config["${var.node_metadata == "UNSPECIFIED" ? "unspecified" : "specified"}"]}"`
`170`	`166`	`}`
`171`	`167`
`172`	`168`	`lifecycle {`
Original file line number	Diff line number	Diff line change
`@@ -103,9 +103,7 @@ resource "google_container_cluster" "zonal_primary" {`
`103`	`103`
`104`	`104`	`node_config {`
`105`	`105`	`service_account = "${lookup(var.node_pools[0], "service_account", local.service_account)}"`
`106`		`- workload_metadata_config {`
`107`		`- node_metadata = "${var.node_metadata}"`
`108`		`- }`
	`106`	`+ workload_metadata_config = "${local.cluster_node_metadata_config["${var.node_metadata == "UNSPECIFIED" ? "unspecified" : "specified"}"]}"`
`109`	`107`	`}`
`110`	`108`	`}`
`111`	`109`
`@@ -165,9 +163,7 @@ resource "google_container_node_pool" "zonal_pools" {`
`165`	`163`	`count = "${lookup(var.node_pools[count.index], "accelerator_count", 0)}"`
`166`	`164`	`}`
`167`	`165`
`168`		`- workload_metadata_config {`
`169`		`- node_metadata = "${var.node_metadata}"`
`170`		`- }`
	`166`	`+ workload_metadata_config = "${local.cluster_node_metadata_config["${var.node_metadata == "UNSPECIFIED" ? "unspecified" : "specified"}"]}"`
`171`	`167`	`}`
`172`	`168`
`173`	`169`	`lifecycle {`