diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl index 4728fbdf75..b15947ff6f 100644 --- 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 index bd9f6ef1eb..4385913d10 100644 --- 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 index c19c575fb6..b66778722f 100644 --- 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 index 6b3bfed709..96a66fcc49 100644 --- 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 index 8f2928f531..6800ab7016 100644 --- 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 index 32a81b0b46..574b89e028 100644 --- 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 index f635cc1801..2de7575db5 100644 --- 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 index 61995dba78..bf6596abb5 100644 --- 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" {