Skip to content

Commit de7328f

Browse files
committed
Replaces list of secondary disks with just single image
1 parent 1bac728 commit de7328f

File tree

8 files changed

+60
-45
lines changed

8 files changed

+60
-45
lines changed

autogen/main/cluster.tf.tmpl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -856,11 +856,12 @@ resource "google_container_node_pool" "windows_pools" {
856856
}
857857
}
858858

859+
# Supports a single secondary boot disk because `map(any)` must have the same values type.
859860
dynamic "secondary_boot_disks" {
860-
for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
861+
for_each = lookup(each.value, "secondary_boot_disk", 0) > 0 ? [each.value.secondary_boot_disks] : []
861862
content {
862-
disk_image = secondary_boot_disks.value.disk_image
863-
mode = secondary_boot_disks.value.mode
863+
disk_image = secondary_boot_disks.value.secondary_boot_disk
864+
mode = "CONTAINER_IMAGE_CACHE"
864865
}
865866
}
866867

cluster.tf

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -574,11 +574,12 @@ resource "google_container_node_pool" "pools" {
574574
}
575575
}
576576

577+
# Supports a single secondary boot disk because `map(any)` must have the same values type.
577578
dynamic "secondary_boot_disks" {
578-
for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
579+
for_each = lookup(each.value, "secondary_boot_disk", 0) > 0 ? [each.value.secondary_boot_disks] : []
579580
content {
580-
disk_image = secondary_boot_disks.value.disk_image
581-
mode = secondary_boot_disks.value.mode
581+
disk_image = secondary_boot_disks.value.secondary_boot_disk
582+
mode = "CONTAINER_IMAGE_CACHE"
582583
}
583584
}
584585

@@ -798,11 +799,12 @@ resource "google_container_node_pool" "windows_pools" {
798799
}
799800
}
800801

802+
# Supports a single secondary boot disk because `map(any)` must have the same values type.
801803
dynamic "secondary_boot_disks" {
802-
for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
804+
for_each = lookup(each.value, "secondary_boot_disk", 0) > 0 ? [each.value.secondary_boot_disks] : []
803805
content {
804-
disk_image = secondary_boot_disks.value.disk_image
805-
mode = secondary_boot_disks.value.mode
806+
disk_image = secondary_boot_disks.value.secondary_boot_disk
807+
mode = "CONTAINER_IMAGE_CACHE"
806808
}
807809
}
808810

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -740,11 +740,12 @@ resource "google_container_node_pool" "pools" {
740740
}
741741
}
742742

743+
# Supports a single secondary boot disk because `map(any)` must have the same values type.
743744
dynamic "secondary_boot_disks" {
744-
for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
745+
for_each = lookup(each.value, "secondary_boot_disk", 0) > 0 ? [each.value.secondary_boot_disks] : []
745746
content {
746-
disk_image = secondary_boot_disks.value.disk_image
747-
mode = secondary_boot_disks.value.mode
747+
disk_image = secondary_boot_disks.value.secondary_boot_disk
748+
mode = "CONTAINER_IMAGE_CACHE"
748749
}
749750
}
750751

@@ -990,11 +991,12 @@ resource "google_container_node_pool" "windows_pools" {
990991
}
991992
}
992993

994+
# Supports a single secondary boot disk because `map(any)` must have the same values type.
993995
dynamic "secondary_boot_disks" {
994-
for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
996+
for_each = lookup(each.value, "secondary_boot_disk", 0) > 0 ? [each.value.secondary_boot_disks] : []
995997
content {
996-
disk_image = secondary_boot_disks.value.disk_image
997-
mode = secondary_boot_disks.value.mode
998+
disk_image = secondary_boot_disks.value.secondary_boot_disk
999+
mode = "CONTAINER_IMAGE_CACHE"
9981000
}
9991001
}
10001002

modules/beta-private-cluster/cluster.tf

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -665,11 +665,12 @@ resource "google_container_node_pool" "pools" {
665665
}
666666
}
667667

668+
# Supports a single secondary boot disk because `map(any)` must have the same values type.
668669
dynamic "secondary_boot_disks" {
669-
for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
670+
for_each = lookup(each.value, "secondary_boot_disk", 0) > 0 ? [each.value.secondary_boot_disks] : []
670671
content {
671-
disk_image = secondary_boot_disks.value.disk_image
672-
mode = secondary_boot_disks.value.mode
672+
disk_image = secondary_boot_disks.value.secondary_boot_disk
673+
mode = "CONTAINER_IMAGE_CACHE"
673674
}
674675
}
675676

@@ -914,11 +915,12 @@ resource "google_container_node_pool" "windows_pools" {
914915
}
915916
}
916917

918+
# Supports a single secondary boot disk because `map(any)` must have the same values type.
917919
dynamic "secondary_boot_disks" {
918-
for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
920+
for_each = lookup(each.value, "secondary_boot_disk", 0) > 0 ? [each.value.secondary_boot_disks] : []
919921
content {
920-
disk_image = secondary_boot_disks.value.disk_image
921-
mode = secondary_boot_disks.value.mode
922+
disk_image = secondary_boot_disks.value.secondary_boot_disk
923+
mode = "CONTAINER_IMAGE_CACHE"
922924
}
923925
}
924926

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -721,11 +721,12 @@ resource "google_container_node_pool" "pools" {
721721
}
722722
}
723723

724+
# Supports a single secondary boot disk because `map(any)` must have the same values type.
724725
dynamic "secondary_boot_disks" {
725-
for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
726+
for_each = lookup(each.value, "secondary_boot_disk", 0) > 0 ? [each.value.secondary_boot_disks] : []
726727
content {
727-
disk_image = secondary_boot_disks.value.disk_image
728-
mode = secondary_boot_disks.value.mode
728+
disk_image = secondary_boot_disks.value.secondary_boot_disk
729+
mode = "CONTAINER_IMAGE_CACHE"
729730
}
730731
}
731732

@@ -971,11 +972,12 @@ resource "google_container_node_pool" "windows_pools" {
971972
}
972973
}
973974

975+
# Supports a single secondary boot disk because `map(any)` must have the same values type.
974976
dynamic "secondary_boot_disks" {
975-
for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
977+
for_each = lookup(each.value, "secondary_boot_disk", 0) > 0 ? [each.value.secondary_boot_disks] : []
976978
content {
977-
disk_image = secondary_boot_disks.value.disk_image
978-
mode = secondary_boot_disks.value.mode
979+
disk_image = secondary_boot_disks.value.secondary_boot_disk
980+
mode = "CONTAINER_IMAGE_CACHE"
979981
}
980982
}
981983

modules/beta-public-cluster/cluster.tf

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -646,11 +646,12 @@ resource "google_container_node_pool" "pools" {
646646
}
647647
}
648648

649+
# Supports a single secondary boot disk because `map(any)` must have the same values type.
649650
dynamic "secondary_boot_disks" {
650-
for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
651+
for_each = lookup(each.value, "secondary_boot_disk", 0) > 0 ? [each.value.secondary_boot_disks] : []
651652
content {
652-
disk_image = secondary_boot_disks.value.disk_image
653-
mode = secondary_boot_disks.value.mode
653+
disk_image = secondary_boot_disks.value.secondary_boot_disk
654+
mode = "CONTAINER_IMAGE_CACHE"
654655
}
655656
}
656657

@@ -895,11 +896,12 @@ resource "google_container_node_pool" "windows_pools" {
895896
}
896897
}
897898

899+
# Supports a single secondary boot disk because `map(any)` must have the same values type.
898900
dynamic "secondary_boot_disks" {
899-
for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
901+
for_each = lookup(each.value, "secondary_boot_disk", 0) > 0 ? [each.value.secondary_boot_disks] : []
900902
content {
901-
disk_image = secondary_boot_disks.value.disk_image
902-
mode = secondary_boot_disks.value.mode
903+
disk_image = secondary_boot_disks.value.secondary_boot_disk
904+
mode = "CONTAINER_IMAGE_CACHE"
903905
}
904906
}
905907

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -668,11 +668,12 @@ resource "google_container_node_pool" "pools" {
668668
}
669669
}
670670

671+
# Supports a single secondary boot disk because `map(any)` must have the same values type.
671672
dynamic "secondary_boot_disks" {
672-
for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
673+
for_each = lookup(each.value, "secondary_boot_disk", 0) > 0 ? [each.value.secondary_boot_disks] : []
673674
content {
674-
disk_image = secondary_boot_disks.value.disk_image
675-
mode = secondary_boot_disks.value.mode
675+
disk_image = secondary_boot_disks.value.secondary_boot_disk
676+
mode = "CONTAINER_IMAGE_CACHE"
676677
}
677678
}
678679

@@ -893,11 +894,12 @@ resource "google_container_node_pool" "windows_pools" {
893894
}
894895
}
895896

897+
# Supports a single secondary boot disk because `map(any)` must have the same values type.
896898
dynamic "secondary_boot_disks" {
897-
for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
899+
for_each = lookup(each.value, "secondary_boot_disk", 0) > 0 ? [each.value.secondary_boot_disks] : []
898900
content {
899-
disk_image = secondary_boot_disks.value.disk_image
900-
mode = secondary_boot_disks.value.mode
901+
disk_image = secondary_boot_disks.value.secondary_boot_disk
902+
mode = "CONTAINER_IMAGE_CACHE"
901903
}
902904
}
903905

modules/private-cluster/cluster.tf

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -593,11 +593,12 @@ resource "google_container_node_pool" "pools" {
593593
}
594594
}
595595

596+
# Supports a single secondary boot disk because `map(any)` must have the same values type.
596597
dynamic "secondary_boot_disks" {
597-
for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
598+
for_each = lookup(each.value, "secondary_boot_disk", 0) > 0 ? [each.value.secondary_boot_disks] : []
598599
content {
599-
disk_image = secondary_boot_disks.value.disk_image
600-
mode = secondary_boot_disks.value.mode
600+
disk_image = secondary_boot_disks.value.secondary_boot_disk
601+
mode = "CONTAINER_IMAGE_CACHE"
601602
}
602603
}
603604

@@ -817,11 +818,12 @@ resource "google_container_node_pool" "windows_pools" {
817818
}
818819
}
819820

821+
# Supports a single secondary boot disk because `map(any)` must have the same values type.
820822
dynamic "secondary_boot_disks" {
821-
for_each = contains(keys(each.value), "secondary_boot_disks") ? each.value.secondary_boot_disks : []
823+
for_each = lookup(each.value, "secondary_boot_disk", 0) > 0 ? [each.value.secondary_boot_disks] : []
822824
content {
823-
disk_image = secondary_boot_disks.value.disk_image
824-
mode = secondary_boot_disks.value.mode
825+
disk_image = secondary_boot_disks.value.secondary_boot_disk
826+
mode = "CONTAINER_IMAGE_CACHE"
825827
}
826828
}
827829

0 commit comments

Comments
 (0)