From b03ea84a1f5bbbc7bd56098cbe1c6905dd581259 Mon Sep 17 00:00:00 2001 From: Fabien Crespel Date: Tue, 14 Feb 2023 07:37:06 +0100 Subject: [PATCH] fix: node_metadata mapping for GCE_METADATA (#1542) (#1543) --- autogen/main/main.tf.tmpl | 2 +- main.tf | 2 +- modules/beta-private-cluster-update-variant/main.tf | 2 +- modules/beta-private-cluster/main.tf | 2 +- modules/beta-public-cluster-update-variant/main.tf | 2 +- modules/beta-public-cluster/main.tf | 2 +- modules/private-cluster-update-variant/main.tf | 2 +- modules/private-cluster/main.tf | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/autogen/main/main.tf.tmpl b/autogen/main/main.tf.tmpl index 5f7b1df38..ce599c65b 100644 --- a/autogen/main/main.tf.tmpl +++ b/autogen/main/main.tf.tmpl @@ -126,7 +126,7 @@ locals { {% if autopilot_cluster != true %} // legacy mappings https://github.com/hashicorp/terraform-provider-google/pull/10238 - old_node_metadata_config_mapping = { GKE_METADATA_SERVER = "GKE_METADATA", GCE_METADATA = "EXPOSE" } + old_node_metadata_config_mapping = { GKE_METADATA_SERVER = "GKE_METADATA", EXPOSE = "GCE_METADATA" } cluster_node_metadata_config = var.node_metadata == "UNSPECIFIED" ? [] : [{ mode = lookup(local.old_node_metadata_config_mapping, var.node_metadata, var.node_metadata) diff --git a/main.tf b/main.tf index 48bf66213..ed5429147 100644 --- a/main.tf +++ b/main.tf @@ -92,7 +92,7 @@ locals { }] // legacy mappings https://github.com/hashicorp/terraform-provider-google/pull/10238 - old_node_metadata_config_mapping = { GKE_METADATA_SERVER = "GKE_METADATA", GCE_METADATA = "EXPOSE" } + old_node_metadata_config_mapping = { GKE_METADATA_SERVER = "GKE_METADATA", EXPOSE = "GCE_METADATA" } cluster_node_metadata_config = var.node_metadata == "UNSPECIFIED" ? [] : [{ mode = lookup(local.old_node_metadata_config_mapping, var.node_metadata, var.node_metadata) diff --git a/modules/beta-private-cluster-update-variant/main.tf b/modules/beta-private-cluster-update-variant/main.tf index 975390944..3c8e1f590 100644 --- a/modules/beta-private-cluster-update-variant/main.tf +++ b/modules/beta-private-cluster-update-variant/main.tf @@ -105,7 +105,7 @@ locals { }] // legacy mappings https://github.com/hashicorp/terraform-provider-google/pull/10238 - old_node_metadata_config_mapping = { GKE_METADATA_SERVER = "GKE_METADATA", GCE_METADATA = "EXPOSE" } + old_node_metadata_config_mapping = { GKE_METADATA_SERVER = "GKE_METADATA", EXPOSE = "GCE_METADATA" } cluster_node_metadata_config = var.node_metadata == "UNSPECIFIED" ? [] : [{ mode = lookup(local.old_node_metadata_config_mapping, var.node_metadata, var.node_metadata) diff --git a/modules/beta-private-cluster/main.tf b/modules/beta-private-cluster/main.tf index 975390944..3c8e1f590 100644 --- a/modules/beta-private-cluster/main.tf +++ b/modules/beta-private-cluster/main.tf @@ -105,7 +105,7 @@ locals { }] // legacy mappings https://github.com/hashicorp/terraform-provider-google/pull/10238 - old_node_metadata_config_mapping = { GKE_METADATA_SERVER = "GKE_METADATA", GCE_METADATA = "EXPOSE" } + old_node_metadata_config_mapping = { GKE_METADATA_SERVER = "GKE_METADATA", EXPOSE = "GCE_METADATA" } cluster_node_metadata_config = var.node_metadata == "UNSPECIFIED" ? [] : [{ mode = lookup(local.old_node_metadata_config_mapping, var.node_metadata, var.node_metadata) diff --git a/modules/beta-public-cluster-update-variant/main.tf b/modules/beta-public-cluster-update-variant/main.tf index 491200ba7..cd60bce50 100644 --- a/modules/beta-public-cluster-update-variant/main.tf +++ b/modules/beta-public-cluster-update-variant/main.tf @@ -105,7 +105,7 @@ locals { }] // legacy mappings https://github.com/hashicorp/terraform-provider-google/pull/10238 - old_node_metadata_config_mapping = { GKE_METADATA_SERVER = "GKE_METADATA", GCE_METADATA = "EXPOSE" } + old_node_metadata_config_mapping = { GKE_METADATA_SERVER = "GKE_METADATA", EXPOSE = "GCE_METADATA" } cluster_node_metadata_config = var.node_metadata == "UNSPECIFIED" ? [] : [{ mode = lookup(local.old_node_metadata_config_mapping, var.node_metadata, var.node_metadata) diff --git a/modules/beta-public-cluster/main.tf b/modules/beta-public-cluster/main.tf index 491200ba7..cd60bce50 100644 --- a/modules/beta-public-cluster/main.tf +++ b/modules/beta-public-cluster/main.tf @@ -105,7 +105,7 @@ locals { }] // legacy mappings https://github.com/hashicorp/terraform-provider-google/pull/10238 - old_node_metadata_config_mapping = { GKE_METADATA_SERVER = "GKE_METADATA", GCE_METADATA = "EXPOSE" } + old_node_metadata_config_mapping = { GKE_METADATA_SERVER = "GKE_METADATA", EXPOSE = "GCE_METADATA" } cluster_node_metadata_config = var.node_metadata == "UNSPECIFIED" ? [] : [{ mode = lookup(local.old_node_metadata_config_mapping, var.node_metadata, var.node_metadata) diff --git a/modules/private-cluster-update-variant/main.tf b/modules/private-cluster-update-variant/main.tf index 1082e1abc..edf1dbe2b 100644 --- a/modules/private-cluster-update-variant/main.tf +++ b/modules/private-cluster-update-variant/main.tf @@ -92,7 +92,7 @@ locals { }] // legacy mappings https://github.com/hashicorp/terraform-provider-google/pull/10238 - old_node_metadata_config_mapping = { GKE_METADATA_SERVER = "GKE_METADATA", GCE_METADATA = "EXPOSE" } + old_node_metadata_config_mapping = { GKE_METADATA_SERVER = "GKE_METADATA", EXPOSE = "GCE_METADATA" } cluster_node_metadata_config = var.node_metadata == "UNSPECIFIED" ? [] : [{ mode = lookup(local.old_node_metadata_config_mapping, var.node_metadata, var.node_metadata) diff --git a/modules/private-cluster/main.tf b/modules/private-cluster/main.tf index 1082e1abc..edf1dbe2b 100644 --- a/modules/private-cluster/main.tf +++ b/modules/private-cluster/main.tf @@ -92,7 +92,7 @@ locals { }] // legacy mappings https://github.com/hashicorp/terraform-provider-google/pull/10238 - old_node_metadata_config_mapping = { GKE_METADATA_SERVER = "GKE_METADATA", GCE_METADATA = "EXPOSE" } + old_node_metadata_config_mapping = { GKE_METADATA_SERVER = "GKE_METADATA", EXPOSE = "GCE_METADATA" } cluster_node_metadata_config = var.node_metadata == "UNSPECIFIED" ? [] : [{ mode = lookup(local.old_node_metadata_config_mapping, var.node_metadata, var.node_metadata)