From 87637f2721b07d2c657ee9cdff52f647fc0caa7b Mon Sep 17 00:00:00 2001 From: redoak666 Date: Wed, 16 Oct 2024 15:56:36 -0500 Subject: [PATCH 1/2] correct confidential node field name --- autogen/main/cluster.tf.tmpl | 2 +- cluster.tf | 2 +- modules/beta-private-cluster-update-variant/cluster.tf | 4 ++-- modules/beta-private-cluster/cluster.tf | 4 ++-- modules/beta-public-cluster-update-variant/cluster.tf | 4 ++-- modules/beta-public-cluster/cluster.tf | 4 ++-- modules/private-cluster-update-variant/cluster.tf | 4 ++-- modules/private-cluster/cluster.tf | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl index debe6594c4..2827aebf12 100644 --- a/autogen/main/cluster.tf.tmpl +++ b/autogen/main/cluster.tf.tmpl @@ -1094,7 +1094,7 @@ resource "google_container_node_pool" "windows_pools" { } dynamic "confidential_nodes" { - for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : [] + for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : [] content { enabled = confidential_nodes.value } diff --git a/cluster.tf b/cluster.tf index 0e821fe071..f92e100945 100644 --- a/cluster.tf +++ b/cluster.tf @@ -782,7 +782,7 @@ resource "google_container_node_pool" "pools" { } dynamic "confidential_nodes" { - for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : [] + for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : [] content { enabled = confidential_nodes.value } diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf index d7e958e3b8..38f75b84b6 100644 --- a/modules/beta-private-cluster-update-variant/cluster.tf +++ b/modules/beta-private-cluster-update-variant/cluster.tf @@ -959,7 +959,7 @@ resource "google_container_node_pool" "pools" { } dynamic "confidential_nodes" { - for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : [] + for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : [] content { enabled = confidential_nodes.value } @@ -1249,7 +1249,7 @@ resource "google_container_node_pool" "windows_pools" { } dynamic "confidential_nodes" { - for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : [] + for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : [] content { enabled = confidential_nodes.value } diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf index 863984c998..6600ac2675 100644 --- a/modules/beta-private-cluster/cluster.tf +++ b/modules/beta-private-cluster/cluster.tf @@ -874,7 +874,7 @@ resource "google_container_node_pool" "pools" { } dynamic "confidential_nodes" { - for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : [] + for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : [] content { enabled = confidential_nodes.value } @@ -1163,7 +1163,7 @@ resource "google_container_node_pool" "windows_pools" { } dynamic "confidential_nodes" { - for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : [] + for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : [] content { enabled = confidential_nodes.value } diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf index 4b69c0b5b6..e43fa5a5a1 100644 --- a/modules/beta-public-cluster-update-variant/cluster.tf +++ b/modules/beta-public-cluster-update-variant/cluster.tf @@ -938,7 +938,7 @@ resource "google_container_node_pool" "pools" { } dynamic "confidential_nodes" { - for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : [] + for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : [] content { enabled = confidential_nodes.value } @@ -1228,7 +1228,7 @@ resource "google_container_node_pool" "windows_pools" { } dynamic "confidential_nodes" { - for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : [] + for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : [] content { enabled = confidential_nodes.value } diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf index debed49080..0c1c6f518a 100644 --- a/modules/beta-public-cluster/cluster.tf +++ b/modules/beta-public-cluster/cluster.tf @@ -853,7 +853,7 @@ resource "google_container_node_pool" "pools" { } dynamic "confidential_nodes" { - for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : [] + for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : [] content { enabled = confidential_nodes.value } @@ -1142,7 +1142,7 @@ resource "google_container_node_pool" "windows_pools" { } dynamic "confidential_nodes" { - for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : [] + for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : [] content { enabled = confidential_nodes.value } diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf index c8489a4082..ae4b58deb2 100644 --- a/modules/private-cluster-update-variant/cluster.tf +++ b/modules/private-cluster-update-variant/cluster.tf @@ -887,7 +887,7 @@ resource "google_container_node_pool" "pools" { } dynamic "confidential_nodes" { - for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : [] + for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : [] content { enabled = confidential_nodes.value } @@ -1164,7 +1164,7 @@ resource "google_container_node_pool" "windows_pools" { } dynamic "confidential_nodes" { - for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : [] + for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : [] content { enabled = confidential_nodes.value } diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf index e31fa67829..5037e10bd8 100644 --- a/modules/private-cluster/cluster.tf +++ b/modules/private-cluster/cluster.tf @@ -803,7 +803,7 @@ resource "google_container_node_pool" "pools" { } dynamic "confidential_nodes" { - for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : [] + for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : [] content { enabled = confidential_nodes.value } @@ -1079,7 +1079,7 @@ resource "google_container_node_pool" "windows_pools" { } dynamic "confidential_nodes" { - for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : [] + for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : [] content { enabled = confidential_nodes.value } From 5664ed35ba7c9a90428b556c7de5bd810317d234 Mon Sep 17 00:00:00 2001 From: redoak666 <20560315+redoak666@users.noreply.github.com> Date: Wed, 16 Oct 2024 17:50:46 -0500 Subject: [PATCH 2/2] update --- cluster.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster.tf b/cluster.tf index f92e100945..70bdfb412e 100644 --- a/cluster.tf +++ b/cluster.tf @@ -1058,7 +1058,7 @@ resource "google_container_node_pool" "windows_pools" { } dynamic "confidential_nodes" { - for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : [] + for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.enable_confidential_nodes] : [] content { enabled = confidential_nodes.value }