Support for node pool node_metadata overrides

Dev25 · Dev25 · commit 066b5d9ee897 · 2020-01-13T18:32:17.000Z
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -433,7 +433,7 @@ resource "google_container_node_pool" "pools" {
       for_each = local.cluster_node_metadata_config
 
       content {
-        node_metadata = workload_metadata_config.value.node_metadata
+        node_metadata = lookup(var.node_pools[count.index], "node_metadata", workload_metadata_config.value.node_metadata)
       }
     }
 
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -400,7 +400,7 @@ resource "google_container_node_pool" "pools" {
       for_each = local.cluster_node_metadata_config
 
       content {
-        node_metadata = workload_metadata_config.value.node_metadata
+        node_metadata = lookup(var.node_pools[count.index], "node_metadata", workload_metadata_config.value.node_metadata)
       }
     }
 
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -328,7 +328,7 @@ resource "google_container_node_pool" "pools" {
       for_each = local.cluster_node_metadata_config
 
       content {
-        node_metadata = workload_metadata_config.value.node_metadata
+        node_metadata = lookup(var.node_pools[count.index], "node_metadata", workload_metadata_config.value.node_metadata)
       }
     }
 
diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -315,7 +315,7 @@ resource "google_container_node_pool" "pools" {
       for_each = local.cluster_node_metadata_config
 
       content {
-        node_metadata = workload_metadata_config.value.node_metadata
+        node_metadata = lookup(var.node_pools[count.index], "node_metadata", workload_metadata_config.value.node_metadata)
       }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -433,7 +433,7 @@ resource "google_container_node_pool" "pools" {`
`433`	`433`	`for_each = local.cluster_node_metadata_config`
`434`	`434`
`435`	`435`	`content {`
`436`		`- node_metadata = workload_metadata_config.value.node_metadata`
	`436`	`+ node_metadata = lookup(var.node_pools[count.index], "node_metadata", workload_metadata_config.value.node_metadata)`
`437`	`437`	`}`
`438`	`438`	`}`
`439`	`439`
Original file line number	Diff line number	Diff line change
`@@ -400,7 +400,7 @@ resource "google_container_node_pool" "pools" {`
`400`	`400`	`for_each = local.cluster_node_metadata_config`
`401`	`401`
`402`	`402`	`content {`
`403`		`- node_metadata = workload_metadata_config.value.node_metadata`
	`403`	`+ node_metadata = lookup(var.node_pools[count.index], "node_metadata", workload_metadata_config.value.node_metadata)`
`404`	`404`	`}`
`405`	`405`	`}`
`406`	`406`
Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,7 @@ resource "google_container_node_pool" "pools" {`
`328`	`328`	`for_each = local.cluster_node_metadata_config`
`329`	`329`
`330`	`330`	`content {`
`331`		`- node_metadata = workload_metadata_config.value.node_metadata`
	`331`	`+ node_metadata = lookup(var.node_pools[count.index], "node_metadata", workload_metadata_config.value.node_metadata)`
`332`	`332`	`}`
`333`	`333`	`}`
`334`	`334`
Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ resource "google_container_node_pool" "pools" {`
`315`	`315`	`for_each = local.cluster_node_metadata_config`
`316`	`316`
`317`	`317`	`content {`
`318`		`- node_metadata = workload_metadata_config.value.node_metadata`
	`318`	`+ node_metadata = lookup(var.node_pools[count.index], "node_metadata", workload_metadata_config.value.node_metadata)`
`319`	`319`	`}`
`320`	`320`	`}`
`321`	`321`