Use network tags from the first node pool

terraform-google-modules · Jan 12, 2022 · 0391098 · 0391098
1 parent 354b4d5
commit 0391098
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
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" {