Skip to content

Commit 12cfe5e

Browse files
DrFaust92DrFaust92
authored
fix: enable_confidential_storage fix (terraform-google-modules#2018)
1 parent 318f38f commit 12cfe5e

File tree

8 files changed

+15
-15
lines changed

8 files changed

+15
-15
lines changed

‎autogen/main/cluster.tf.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,7 @@ resource "google_container_node_pool" "windows_pools" {
861861
image_type = lookup(each.value, "image_type", "COS_CONTAINERD")
862862
machine_type = lookup(each.value, "machine_type", "e2-medium")
863863
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
864-
enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
864+
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
865865
dynamic "gcfs_config" {
866866
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
867867
content {

‎cluster.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ resource "google_container_node_pool" "pools" {
574574
image_type = lookup(each.value, "image_type", "COS_CONTAINERD")
575575
machine_type = lookup(each.value, "machine_type", "e2-medium")
576576
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
577-
enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
577+
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
578578
dynamic "gcfs_config" {
579579
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
580580
content {
@@ -847,7 +847,7 @@ resource "google_container_node_pool" "windows_pools" {
847847
image_type = lookup(each.value, "image_type", "COS_CONTAINERD")
848848
machine_type = lookup(each.value, "machine_type", "e2-medium")
849849
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
850-
enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
850+
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
851851
dynamic "gcfs_config" {
852852
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
853853
content {

‎modules/beta-private-cluster-update-variant/cluster.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ resource "google_container_node_pool" "pools" {
737737
image_type = lookup(each.value, "image_type", "COS_CONTAINERD")
738738
machine_type = lookup(each.value, "machine_type", "e2-medium")
739739
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
740-
enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
740+
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
741741
dynamic "gcfs_config" {
742742
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
743743
content {
@@ -1024,7 +1024,7 @@ resource "google_container_node_pool" "windows_pools" {
10241024
image_type = lookup(each.value, "image_type", "COS_CONTAINERD")
10251025
machine_type = lookup(each.value, "machine_type", "e2-medium")
10261026
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
1027-
enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
1027+
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
10281028
dynamic "gcfs_config" {
10291029
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
10301030
content {

‎modules/beta-private-cluster/cluster.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ resource "google_container_node_pool" "pools" {
657657
image_type = lookup(each.value, "image_type", "COS_CONTAINERD")
658658
machine_type = lookup(each.value, "machine_type", "e2-medium")
659659
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
660-
enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
660+
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
661661
dynamic "gcfs_config" {
662662
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
663663
content {
@@ -943,7 +943,7 @@ resource "google_container_node_pool" "windows_pools" {
943943
image_type = lookup(each.value, "image_type", "COS_CONTAINERD")
944944
machine_type = lookup(each.value, "machine_type", "e2-medium")
945945
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
946-
enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
946+
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
947947
dynamic "gcfs_config" {
948948
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
949949
content {

‎modules/beta-public-cluster-update-variant/cluster.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,7 @@ resource "google_container_node_pool" "pools" {
718718
image_type = lookup(each.value, "image_type", "COS_CONTAINERD")
719719
machine_type = lookup(each.value, "machine_type", "e2-medium")
720720
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
721-
enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
721+
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
722722
dynamic "gcfs_config" {
723723
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
724724
content {
@@ -1005,7 +1005,7 @@ resource "google_container_node_pool" "windows_pools" {
10051005
image_type = lookup(each.value, "image_type", "COS_CONTAINERD")
10061006
machine_type = lookup(each.value, "machine_type", "e2-medium")
10071007
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
1008-
enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
1008+
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
10091009
dynamic "gcfs_config" {
10101010
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
10111011
content {

‎modules/beta-public-cluster/cluster.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ resource "google_container_node_pool" "pools" {
638638
image_type = lookup(each.value, "image_type", "COS_CONTAINERD")
639639
machine_type = lookup(each.value, "machine_type", "e2-medium")
640640
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
641-
enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
641+
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
642642
dynamic "gcfs_config" {
643643
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
644644
content {
@@ -924,7 +924,7 @@ resource "google_container_node_pool" "windows_pools" {
924924
image_type = lookup(each.value, "image_type", "COS_CONTAINERD")
925925
machine_type = lookup(each.value, "machine_type", "e2-medium")
926926
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
927-
enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
927+
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
928928
dynamic "gcfs_config" {
929929
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
930930
content {

‎modules/private-cluster-update-variant/cluster.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ resource "google_container_node_pool" "pools" {
673673
image_type = lookup(each.value, "image_type", "COS_CONTAINERD")
674674
machine_type = lookup(each.value, "machine_type", "e2-medium")
675675
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
676-
enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
676+
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
677677
dynamic "gcfs_config" {
678678
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
679679
content {
@@ -947,7 +947,7 @@ resource "google_container_node_pool" "windows_pools" {
947947
image_type = lookup(each.value, "image_type", "COS_CONTAINERD")
948948
machine_type = lookup(each.value, "machine_type", "e2-medium")
949949
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
950-
enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
950+
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
951951
dynamic "gcfs_config" {
952952
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
953953
content {

‎modules/private-cluster/cluster.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ resource "google_container_node_pool" "pools" {
593593
image_type = lookup(each.value, "image_type", "COS_CONTAINERD")
594594
machine_type = lookup(each.value, "machine_type", "e2-medium")
595595
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
596-
enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
596+
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
597597
dynamic "gcfs_config" {
598598
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
599599
content {
@@ -866,7 +866,7 @@ resource "google_container_node_pool" "windows_pools" {
866866
image_type = lookup(each.value, "image_type", "COS_CONTAINERD")
867867
machine_type = lookup(each.value, "machine_type", "e2-medium")
868868
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
869-
enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
869+
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
870870
dynamic "gcfs_config" {
871871
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
872872
content {

0 commit comments

Comments
 (0)