fix: enable_confidential_storage fix (#2018)

terraform-google-modules · Jul 31, 2024 · 12cfe5e · 12cfe5e
1 parent 318f38f
commit 12cfe5e
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 {