From 3ee9d7f32f2713a1b21b478ad4bf42dbed48a0df Mon Sep 17 00:00:00 2001 From: drfaust92 Date: Tue, 30 Jul 2024 22:51:46 -0400 Subject: [PATCH] enable_confidential_storage fix --- autogen/main/cluster.tf.tmpl | 2 +- cluster.tf | 4 ++-- 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, 15 insertions(+), 15 deletions(-) diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl index 5f511641a3..f1c0d104f2 100644 --- a/autogen/main/cluster.tf.tmpl +++ b/autogen/main/cluster.tf.tmpl @@ -861,7 +861,7 @@ resource "google_container_node_pool" "windows_pools" { image_type = lookup(each.value, "image_type", "COS_CONTAINERD") machine_type = lookup(each.value, "machine_type", "e2-medium") min_cpu_platform = lookup(each.value, "min_cpu_platform", "") - enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false) + enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false) dynamic "gcfs_config" { for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [] content { diff --git a/cluster.tf b/cluster.tf index d39305af0b..8d2d83198e 100644 --- a/cluster.tf +++ b/cluster.tf @@ -574,7 +574,7 @@ resource "google_container_node_pool" "pools" { image_type = lookup(each.value, "image_type", "COS_CONTAINERD") machine_type = lookup(each.value, "machine_type", "e2-medium") min_cpu_platform = lookup(each.value, "min_cpu_platform", "") - enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false) + enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false) dynamic "gcfs_config" { for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [] content { @@ -847,7 +847,7 @@ resource "google_container_node_pool" "windows_pools" { image_type = lookup(each.value, "image_type", "COS_CONTAINERD") machine_type = lookup(each.value, "machine_type", "e2-medium") min_cpu_platform = lookup(each.value, "min_cpu_platform", "") - enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false) + enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false) dynamic "gcfs_config" { for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [] content { diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf index f974c472d0..5b35e79efa 100644 --- a/modules/beta-private-cluster-update-variant/cluster.tf +++ b/modules/beta-private-cluster-update-variant/cluster.tf @@ -737,7 +737,7 @@ resource "google_container_node_pool" "pools" { image_type = lookup(each.value, "image_type", "COS_CONTAINERD") machine_type = lookup(each.value, "machine_type", "e2-medium") min_cpu_platform = lookup(each.value, "min_cpu_platform", "") - enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false) + enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false) dynamic "gcfs_config" { for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [] content { @@ -1024,7 +1024,7 @@ resource "google_container_node_pool" "windows_pools" { image_type = lookup(each.value, "image_type", "COS_CONTAINERD") machine_type = lookup(each.value, "machine_type", "e2-medium") min_cpu_platform = lookup(each.value, "min_cpu_platform", "") - enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false) + enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false) dynamic "gcfs_config" { for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [] content { diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf index 4c925fe88b..d430b2f90c 100644 --- a/modules/beta-private-cluster/cluster.tf +++ b/modules/beta-private-cluster/cluster.tf @@ -657,7 +657,7 @@ resource "google_container_node_pool" "pools" { image_type = lookup(each.value, "image_type", "COS_CONTAINERD") machine_type = lookup(each.value, "machine_type", "e2-medium") min_cpu_platform = lookup(each.value, "min_cpu_platform", "") - enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false) + enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false) dynamic "gcfs_config" { for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [] content { @@ -943,7 +943,7 @@ resource "google_container_node_pool" "windows_pools" { image_type = lookup(each.value, "image_type", "COS_CONTAINERD") machine_type = lookup(each.value, "machine_type", "e2-medium") min_cpu_platform = lookup(each.value, "min_cpu_platform", "") - enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false) + enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false) dynamic "gcfs_config" { for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [] content { diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf index a94ff555d0..a61f0f88b6 100644 --- a/modules/beta-public-cluster-update-variant/cluster.tf +++ b/modules/beta-public-cluster-update-variant/cluster.tf @@ -718,7 +718,7 @@ resource "google_container_node_pool" "pools" { image_type = lookup(each.value, "image_type", "COS_CONTAINERD") machine_type = lookup(each.value, "machine_type", "e2-medium") min_cpu_platform = lookup(each.value, "min_cpu_platform", "") - enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false) + enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false) dynamic "gcfs_config" { for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [] content { @@ -1005,7 +1005,7 @@ resource "google_container_node_pool" "windows_pools" { image_type = lookup(each.value, "image_type", "COS_CONTAINERD") machine_type = lookup(each.value, "machine_type", "e2-medium") min_cpu_platform = lookup(each.value, "min_cpu_platform", "") - enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false) + enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false) dynamic "gcfs_config" { for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [] content { diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf index a829d40236..0261482a09 100644 --- a/modules/beta-public-cluster/cluster.tf +++ b/modules/beta-public-cluster/cluster.tf @@ -638,7 +638,7 @@ resource "google_container_node_pool" "pools" { image_type = lookup(each.value, "image_type", "COS_CONTAINERD") machine_type = lookup(each.value, "machine_type", "e2-medium") min_cpu_platform = lookup(each.value, "min_cpu_platform", "") - enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false) + enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false) dynamic "gcfs_config" { for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [] content { @@ -924,7 +924,7 @@ resource "google_container_node_pool" "windows_pools" { image_type = lookup(each.value, "image_type", "COS_CONTAINERD") machine_type = lookup(each.value, "machine_type", "e2-medium") min_cpu_platform = lookup(each.value, "min_cpu_platform", "") - enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false) + enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false) dynamic "gcfs_config" { for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [] content { diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf index 6dd1b7ead9..7a6a74556f 100644 --- a/modules/private-cluster-update-variant/cluster.tf +++ b/modules/private-cluster-update-variant/cluster.tf @@ -673,7 +673,7 @@ resource "google_container_node_pool" "pools" { image_type = lookup(each.value, "image_type", "COS_CONTAINERD") machine_type = lookup(each.value, "machine_type", "e2-medium") min_cpu_platform = lookup(each.value, "min_cpu_platform", "") - enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false) + enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false) dynamic "gcfs_config" { for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [] content { @@ -947,7 +947,7 @@ resource "google_container_node_pool" "windows_pools" { image_type = lookup(each.value, "image_type", "COS_CONTAINERD") machine_type = lookup(each.value, "machine_type", "e2-medium") min_cpu_platform = lookup(each.value, "min_cpu_platform", "") - enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false) + enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false) dynamic "gcfs_config" { for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [] content { diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf index b34f512081..334bcc2e8d 100644 --- a/modules/private-cluster/cluster.tf +++ b/modules/private-cluster/cluster.tf @@ -593,7 +593,7 @@ resource "google_container_node_pool" "pools" { image_type = lookup(each.value, "image_type", "COS_CONTAINERD") machine_type = lookup(each.value, "machine_type", "e2-medium") min_cpu_platform = lookup(each.value, "min_cpu_platform", "") - enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false) + enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false) dynamic "gcfs_config" { for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [] content { @@ -866,7 +866,7 @@ resource "google_container_node_pool" "windows_pools" { image_type = lookup(each.value, "image_type", "COS_CONTAINERD") machine_type = lookup(each.value, "machine_type", "e2-medium") min_cpu_platform = lookup(each.value, "min_cpu_platform", "") - enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false) + enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false) dynamic "gcfs_config" { for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [] content {