Use network tags from the first node pool

tomasgareau · tomasgareau · commit 039109805a1a · 2022-01-12T17:14:40.000-06:00
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -292,7 +292,7 @@ resource "google_container_cluster" "primary" {
         lookup(local.node_pools_tags, "default_values", [true, true])[0] ? [local.cluster_network_tag] : [],
         lookup(local.node_pools_tags, "default_values", [true, true])[1] ? ["${local.cluster_network_tag}-default-pool"] : [],
         lookup(local.node_pools_tags, "all", []),
-        lookup(local.node_pools_tags, "default-pool", []),
+        lookup(local.node_pools_tags, var.node_pools[0].name, []),
       )
 
       dynamic "workload_metadata_config" {
diff --git a/cluster.tf b/cluster.tf
@@ -156,7 +156,7 @@ resource "google_container_cluster" "primary" {
         lookup(local.node_pools_tags, "default_values", [true, true])[0] ? [local.cluster_network_tag] : [],
         lookup(local.node_pools_tags, "default_values", [true, true])[1] ? ["${local.cluster_network_tag}-default-pool"] : [],
         lookup(local.node_pools_tags, "all", []),
-        lookup(local.node_pools_tags, "default-pool", []),
+        lookup(local.node_pools_tags, var.node_pools[0].name, []),
       )
 
       dynamic "workload_metadata_config" {
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -257,7 +257,7 @@ resource "google_container_cluster" "primary" {
         lookup(local.node_pools_tags, "default_values", [true, true])[0] ? [local.cluster_network_tag] : [],
         lookup(local.node_pools_tags, "default_values", [true, true])[1] ? ["${local.cluster_network_tag}-default-pool"] : [],
         lookup(local.node_pools_tags, "all", []),
-        lookup(local.node_pools_tags, "default-pool", []),
+        lookup(local.node_pools_tags, var.node_pools[0].name, []),
       )
 
       dynamic "workload_metadata_config" {
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -257,7 +257,7 @@ resource "google_container_cluster" "primary" {
         lookup(local.node_pools_tags, "default_values", [true, true])[0] ? [local.cluster_network_tag] : [],
         lookup(local.node_pools_tags, "default_values", [true, true])[1] ? ["${local.cluster_network_tag}-default-pool"] : [],
         lookup(local.node_pools_tags, "all", []),
-        lookup(local.node_pools_tags, "default-pool", []),
+        lookup(local.node_pools_tags, var.node_pools[0].name, []),
       )
 
       dynamic "workload_metadata_config" {
diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -257,7 +257,7 @@ resource "google_container_cluster" "primary" {
         lookup(local.node_pools_tags, "default_values", [true, true])[0] ? [local.cluster_network_tag] : [],
         lookup(local.node_pools_tags, "default_values", [true, true])[1] ? ["${local.cluster_network_tag}-default-pool"] : [],
         lookup(local.node_pools_tags, "all", []),
-        lookup(local.node_pools_tags, "default-pool", []),
+        lookup(local.node_pools_tags, var.node_pools[0].name, []),
       )
 
       dynamic "workload_metadata_config" {
diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -257,7 +257,7 @@ resource "google_container_cluster" "primary" {
         lookup(local.node_pools_tags, "default_values", [true, true])[0] ? [local.cluster_network_tag] : [],
         lookup(local.node_pools_tags, "default_values", [true, true])[1] ? ["${local.cluster_network_tag}-default-pool"] : [],
         lookup(local.node_pools_tags, "all", []),
-        lookup(local.node_pools_tags, "default-pool", []),
+        lookup(local.node_pools_tags, var.node_pools[0].name, []),
       )
 
       dynamic "workload_metadata_config" {
diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -156,7 +156,7 @@ resource "google_container_cluster" "primary" {
         lookup(local.node_pools_tags, "default_values", [true, true])[0] ? [local.cluster_network_tag] : [],
         lookup(local.node_pools_tags, "default_values", [true, true])[1] ? ["${local.cluster_network_tag}-default-pool"] : [],
         lookup(local.node_pools_tags, "all", []),
-        lookup(local.node_pools_tags, "default-pool", []),
+        lookup(local.node_pools_tags, var.node_pools[0].name, []),
       )
 
       dynamic "workload_metadata_config" {
diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -156,7 +156,7 @@ resource "google_container_cluster" "primary" {
         lookup(local.node_pools_tags, "default_values", [true, true])[0] ? [local.cluster_network_tag] : [],
         lookup(local.node_pools_tags, "default_values", [true, true])[1] ? ["${local.cluster_network_tag}-default-pool"] : [],
         lookup(local.node_pools_tags, "all", []),
-        lookup(local.node_pools_tags, "default-pool", []),
+        lookup(local.node_pools_tags, var.node_pools[0].name, []),
       )
 
       dynamic "workload_metadata_config" {

Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ resource "google_container_cluster" "primary" {`
`292`	`292`	`lookup(local.node_pools_tags, "default_values", [true, true])[0] ? [local.cluster_network_tag] : [],`
`293`	`293`	`lookup(local.node_pools_tags, "default_values", [true, true])[1] ? ["${local.cluster_network_tag}-default-pool"] : [],`
`294`	`294`	`lookup(local.node_pools_tags, "all", []),`
`295`		`- lookup(local.node_pools_tags, "default-pool", []),`
	`295`	`+ lookup(local.node_pools_tags, var.node_pools[0].name, []),`
`296`	`296`	`)`
`297`	`297`
`298`	`298`	`dynamic "workload_metadata_config" {`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ resource "google_container_cluster" "primary" {`
`156`	`156`	`lookup(local.node_pools_tags, "default_values", [true, true])[0] ? [local.cluster_network_tag] : [],`
`157`	`157`	`lookup(local.node_pools_tags, "default_values", [true, true])[1] ? ["${local.cluster_network_tag}-default-pool"] : [],`
`158`	`158`	`lookup(local.node_pools_tags, "all", []),`
`159`		`- lookup(local.node_pools_tags, "default-pool", []),`
	`159`	`+ lookup(local.node_pools_tags, var.node_pools[0].name, []),`
`160`	`160`	`)`
`161`	`161`
`162`	`162`	`dynamic "workload_metadata_config" {`
Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ resource "google_container_cluster" "primary" {`
`257`	`257`	`lookup(local.node_pools_tags, "default_values", [true, true])[0] ? [local.cluster_network_tag] : [],`
`258`	`258`	`lookup(local.node_pools_tags, "default_values", [true, true])[1] ? ["${local.cluster_network_tag}-default-pool"] : [],`
`259`	`259`	`lookup(local.node_pools_tags, "all", []),`
`260`		`- lookup(local.node_pools_tags, "default-pool", []),`
	`260`	`+ lookup(local.node_pools_tags, var.node_pools[0].name, []),`
`261`	`261`	`)`
`262`	`262`
`263`	`263`	`dynamic "workload_metadata_config" {`