Skip to content

Commit 667a807

Browse files
ProgEstevesProgEsteves
committed
Fix upgrade_settings structure
1 parent 0ed57d6 commit 667a807

File tree

8 files changed

+150
-150
lines changed

8 files changed

+150
-150
lines changed

‎autogen/main/cluster.tf.tmpl

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -685,26 +685,26 @@ resource "google_container_node_pool" "windows_pools" {
685685
}
686686

687687
dynamic "upgrade_settings" {
688-
for_each = lookup(each.value, "strategy", var.strategy) == "SURGE" ? [each.value] : []
688+
for_each = lookup(each.value, "strategy", "SURGE") == "SURGE" ? [each.value] : []
689689
content {
690-
strategy = lookup(each.value, "strategy", "SURGE")
691-
max_surge = lookup(each.value, "max_surge", 1)
692-
max_unavailable = lookup(each.value, "max_unavailable", 0)
690+
strategy = lookup(upgrade_settings.value, "strategy", "SURGE")
691+
max_surge = lookup(upgrade_settings.value, "max_surge", 1)
692+
max_unavailable = lookup(upgrade_settings.value, "max_unavailable", 0)
693693
}
694694
}
695695

696696
dynamic "upgrade_settings" {
697-
for_each = lookup(each.value, "strategy", var.strategy) == "BLUE_GREEN" ? [each.value] : []
697+
for_each = lookup(each.value, "strategy", "SURGE") == "BLUE_GREEN" ? [each.value] : []
698698
content {
699-
strategy = lookup(each.value, "strategy", "BLUE_GREEN")
699+
strategy = lookup(upgrade_settings.value, "strategy")
700700

701701
blue_green_settings {
702-
node_pool_soak_duration = lookup(each.value, "node_pool_soak_duration", "3600s")
702+
node_pool_soak_duration = lookup(upgrade_settings.value, "node_pool_soak_duration", "3600s")
703703

704704
standard_rollout_policy {
705-
batch_soak_duration = lookup(each.value, "batch_soak_duration", "60s")
706-
batch_percentage = lookup(each.value, "batch_percentage", null)
707-
batch_node_count = lookup(each.value, "batch_node_count", null)
705+
batch_soak_duration = lookup(upgrade_settings.value, "batch_soak_duration", "60s")
706+
batch_percentage = lookup(upgrade_settings.value, "batch_percentage", null)
707+
batch_node_count = lookup(upgrade_settings.value, "batch_node_count", null)
708708
}
709709
}
710710
}

‎cluster.tf

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -406,26 +406,26 @@ resource "google_container_node_pool" "pools" {
406406
}
407407

408408
dynamic "upgrade_settings" {
409-
for_each = lookup(each.value, "strategy", var.strategy) == "SURGE" ? [each.value] : []
409+
for_each = lookup(each.value, "strategy", "SURGE") == "SURGE" ? [each.value] : []
410410
content {
411-
strategy = lookup(each.value, "strategy", "SURGE")
412-
max_surge = lookup(each.value, "max_surge", 1)
413-
max_unavailable = lookup(each.value, "max_unavailable", 0)
411+
strategy = lookup(upgrade_settings.value, "strategy", "SURGE")
412+
max_surge = lookup(upgrade_settings.value, "max_surge", 1)
413+
max_unavailable = lookup(upgrade_settings.value, "max_unavailable", 0)
414414
}
415415
}
416416

417417
dynamic "upgrade_settings" {
418-
for_each = lookup(each.value, "strategy", var.strategy) == "BLUE_GREEN" ? [each.value] : []
418+
for_each = lookup(each.value, "strategy", "SURGE") == "BLUE_GREEN" ? [each.value] : []
419419
content {
420-
strategy = lookup(each.value, "strategy", "BLUE_GREEN")
420+
strategy = lookup(upgrade_settings.value, "strategy")
421421

422422
blue_green_settings {
423-
node_pool_soak_duration = lookup(each.value, "node_pool_soak_duration", "3600s")
423+
node_pool_soak_duration = lookup(upgrade_settings.value, "node_pool_soak_duration", "3600s")
424424

425425
standard_rollout_policy {
426-
batch_soak_duration = lookup(each.value, "batch_soak_duration", "60s")
427-
batch_percentage = lookup(each.value, "batch_percentage", null)
428-
batch_node_count = lookup(each.value, "batch_node_count", null)
426+
batch_soak_duration = lookup(upgrade_settings.value, "batch_soak_duration", "60s")
427+
batch_percentage = lookup(upgrade_settings.value, "batch_percentage", null)
428+
batch_node_count = lookup(upgrade_settings.value, "batch_node_count", null)
429429
}
430430
}
431431
}
@@ -599,26 +599,26 @@ resource "google_container_node_pool" "windows_pools" {
599599
}
600600

601601
dynamic "upgrade_settings" {
602-
for_each = lookup(each.value, "strategy", var.strategy) == "SURGE" ? [each.value] : []
602+
for_each = lookup(each.value, "strategy", "SURGE") == "SURGE" ? [each.value] : []
603603
content {
604-
strategy = lookup(each.value, "strategy", "SURGE")
605-
max_surge = lookup(each.value, "max_surge", 1)
606-
max_unavailable = lookup(each.value, "max_unavailable", 0)
604+
strategy = lookup(upgrade_settings.value, "strategy", "SURGE")
605+
max_surge = lookup(upgrade_settings.value, "max_surge", 1)
606+
max_unavailable = lookup(upgrade_settings.value, "max_unavailable", 0)
607607
}
608608
}
609609

610610
dynamic "upgrade_settings" {
611-
for_each = lookup(each.value, "strategy", var.strategy) == "BLUE_GREEN" ? [each.value] : []
611+
for_each = lookup(each.value, "strategy", "SURGE") == "BLUE_GREEN" ? [each.value] : []
612612
content {
613-
strategy = lookup(each.value, "strategy", "BLUE_GREEN")
613+
strategy = lookup(upgrade_settings.value, "strategy")
614614

615615
blue_green_settings {
616-
node_pool_soak_duration = lookup(each.value, "node_pool_soak_duration", "3600s")
616+
node_pool_soak_duration = lookup(upgrade_settings.value, "node_pool_soak_duration", "3600s")
617617

618618
standard_rollout_policy {
619-
batch_soak_duration = lookup(each.value, "batch_soak_duration", "60s")
620-
batch_percentage = lookup(each.value, "batch_percentage", null)
621-
batch_node_count = lookup(each.value, "batch_node_count", null)
619+
batch_soak_duration = lookup(upgrade_settings.value, "batch_soak_duration", "60s")
620+
batch_percentage = lookup(upgrade_settings.value, "batch_percentage", null)
621+
batch_node_count = lookup(upgrade_settings.value, "batch_node_count", null)
622622
}
623623
}
624624
}

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -595,26 +595,26 @@ resource "google_container_node_pool" "pools" {
595595
}
596596

597597
dynamic "upgrade_settings" {
598-
for_each = lookup(each.value, "strategy", var.strategy) == "SURGE" ? [each.value] : []
598+
for_each = lookup(each.value, "strategy", "SURGE") == "SURGE" ? [each.value] : []
599599
content {
600-
strategy = lookup(each.value, "strategy", "SURGE")
601-
max_surge = lookup(each.value, "max_surge", 1)
602-
max_unavailable = lookup(each.value, "max_unavailable", 0)
600+
strategy = lookup(upgrade_settings.value, "strategy", "SURGE")
601+
max_surge = lookup(upgrade_settings.value, "max_surge", 1)
602+
max_unavailable = lookup(upgrade_settings.value, "max_unavailable", 0)
603603
}
604604
}
605605

606606
dynamic "upgrade_settings" {
607-
for_each = lookup(each.value, "strategy", var.strategy) == "BLUE_GREEN" ? [each.value] : []
607+
for_each = lookup(each.value, "strategy", "SURGE") == "BLUE_GREEN" ? [each.value] : []
608608
content {
609-
strategy = lookup(each.value, "strategy", "BLUE_GREEN")
609+
strategy = lookup(upgrade_settings.value, "strategy")
610610

611611
blue_green_settings {
612-
node_pool_soak_duration = lookup(each.value, "node_pool_soak_duration", "3600s")
612+
node_pool_soak_duration = lookup(upgrade_settings.value, "node_pool_soak_duration", "3600s")
613613

614614
standard_rollout_policy {
615-
batch_soak_duration = lookup(each.value, "batch_soak_duration", "60s")
616-
batch_percentage = lookup(each.value, "batch_percentage", null)
617-
batch_node_count = lookup(each.value, "batch_node_count", null)
615+
batch_soak_duration = lookup(upgrade_settings.value, "batch_soak_duration", "60s")
616+
batch_percentage = lookup(upgrade_settings.value, "batch_percentage", null)
617+
batch_node_count = lookup(upgrade_settings.value, "batch_node_count", null)
618618
}
619619
}
620620
}
@@ -828,26 +828,26 @@ resource "google_container_node_pool" "windows_pools" {
828828
}
829829

830830
dynamic "upgrade_settings" {
831-
for_each = lookup(each.value, "strategy", var.strategy) == "SURGE" ? [each.value] : []
831+
for_each = lookup(each.value, "strategy", "SURGE") == "SURGE" ? [each.value] : []
832832
content {
833-
strategy = lookup(each.value, "strategy", "SURGE")
834-
max_surge = lookup(each.value, "max_surge", 1)
835-
max_unavailable = lookup(each.value, "max_unavailable", 0)
833+
strategy = lookup(upgrade_settings.value, "strategy", "SURGE")
834+
max_surge = lookup(upgrade_settings.value, "max_surge", 1)
835+
max_unavailable = lookup(upgrade_settings.value, "max_unavailable", 0)
836836
}
837837
}
838838

839839
dynamic "upgrade_settings" {
840-
for_each = lookup(each.value, "strategy", var.strategy) == "BLUE_GREEN" ? [each.value] : []
840+
for_each = lookup(each.value, "strategy", "SURGE") == "BLUE_GREEN" ? [each.value] : []
841841
content {
842-
strategy = lookup(each.value, "strategy", "BLUE_GREEN")
842+
strategy = lookup(upgrade_settings.value, "strategy")
843843

844844
blue_green_settings {
845-
node_pool_soak_duration = lookup(each.value, "node_pool_soak_duration", "3600s")
845+
node_pool_soak_duration = lookup(upgrade_settings.value, "node_pool_soak_duration", "3600s")
846846

847847
standard_rollout_policy {
848-
batch_soak_duration = lookup(each.value, "batch_soak_duration", "60s")
849-
batch_percentage = lookup(each.value, "batch_percentage", null)
850-
batch_node_count = lookup(each.value, "batch_node_count", null)
848+
batch_soak_duration = lookup(upgrade_settings.value, "batch_soak_duration", "60s")
849+
batch_percentage = lookup(upgrade_settings.value, "batch_percentage", null)
850+
batch_node_count = lookup(upgrade_settings.value, "batch_node_count", null)
851851
}
852852
}
853853
}

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -501,26 +501,26 @@ resource "google_container_node_pool" "pools" {
501501
}
502502

503503
dynamic "upgrade_settings" {
504-
for_each = lookup(each.value, "strategy", var.strategy) == "SURGE" ? [each.value] : []
504+
for_each = lookup(each.value, "strategy", "SURGE") == "SURGE" ? [each.value] : []
505505
content {
506-
strategy = lookup(each.value, "strategy", "SURGE")
507-
max_surge = lookup(each.value, "max_surge", 1)
508-
max_unavailable = lookup(each.value, "max_unavailable", 0)
506+
strategy = lookup(upgrade_settings.value, "strategy", "SURGE")
507+
max_surge = lookup(upgrade_settings.value, "max_surge", 1)
508+
max_unavailable = lookup(upgrade_settings.value, "max_unavailable", 0)
509509
}
510510
}
511511

512512
dynamic "upgrade_settings" {
513-
for_each = lookup(each.value, "strategy", var.strategy) == "BLUE_GREEN" ? [each.value] : []
513+
for_each = lookup(each.value, "strategy", "SURGE") == "BLUE_GREEN" ? [each.value] : []
514514
content {
515-
strategy = lookup(each.value, "strategy", "BLUE_GREEN")
515+
strategy = lookup(upgrade_settings.value, "strategy")
516516

517517
blue_green_settings {
518-
node_pool_soak_duration = lookup(each.value, "node_pool_soak_duration", "3600s")
518+
node_pool_soak_duration = lookup(upgrade_settings.value, "node_pool_soak_duration", "3600s")
519519

520520
standard_rollout_policy {
521-
batch_soak_duration = lookup(each.value, "batch_soak_duration", "60s")
522-
batch_percentage = lookup(each.value, "batch_percentage", null)
523-
batch_node_count = lookup(each.value, "batch_node_count", null)
521+
batch_soak_duration = lookup(upgrade_settings.value, "batch_soak_duration", "60s")
522+
batch_percentage = lookup(upgrade_settings.value, "batch_percentage", null)
523+
batch_node_count = lookup(upgrade_settings.value, "batch_node_count", null)
524524
}
525525
}
526526
}
@@ -733,26 +733,26 @@ resource "google_container_node_pool" "windows_pools" {
733733
}
734734

735735
dynamic "upgrade_settings" {
736-
for_each = lookup(each.value, "strategy", var.strategy) == "SURGE" ? [each.value] : []
736+
for_each = lookup(each.value, "strategy", "SURGE") == "SURGE" ? [each.value] : []
737737
content {
738-
strategy = lookup(each.value, "strategy", "SURGE")
739-
max_surge = lookup(each.value, "max_surge", 1)
740-
max_unavailable = lookup(each.value, "max_unavailable", 0)
738+
strategy = lookup(upgrade_settings.value, "strategy", "SURGE")
739+
max_surge = lookup(upgrade_settings.value, "max_surge", 1)
740+
max_unavailable = lookup(upgrade_settings.value, "max_unavailable", 0)
741741
}
742742
}
743743

744744
dynamic "upgrade_settings" {
745-
for_each = lookup(each.value, "strategy", var.strategy) == "BLUE_GREEN" ? [each.value] : []
745+
for_each = lookup(each.value, "strategy", "SURGE") == "BLUE_GREEN" ? [each.value] : []
746746
content {
747-
strategy = lookup(each.value, "strategy", "BLUE_GREEN")
747+
strategy = lookup(upgrade_settings.value, "strategy")
748748

749749
blue_green_settings {
750-
node_pool_soak_duration = lookup(each.value, "node_pool_soak_duration", "3600s")
750+
node_pool_soak_duration = lookup(upgrade_settings.value, "node_pool_soak_duration", "3600s")
751751

752752
standard_rollout_policy {
753-
batch_soak_duration = lookup(each.value, "batch_soak_duration", "60s")
754-
batch_percentage = lookup(each.value, "batch_percentage", null)
755-
batch_node_count = lookup(each.value, "batch_node_count", null)
753+
batch_soak_duration = lookup(upgrade_settings.value, "batch_soak_duration", "60s")
754+
batch_percentage = lookup(upgrade_settings.value, "batch_percentage", null)
755+
batch_node_count = lookup(upgrade_settings.value, "batch_node_count", null)
756756
}
757757
}
758758
}

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -575,26 +575,26 @@ resource "google_container_node_pool" "pools" {
575575
}
576576

577577
dynamic "upgrade_settings" {
578-
for_each = lookup(each.value, "strategy", var.strategy) == "SURGE" ? [each.value] : []
578+
for_each = lookup(each.value, "strategy", "SURGE") == "SURGE" ? [each.value] : []
579579
content {
580-
strategy = lookup(each.value, "strategy", "SURGE")
581-
max_surge = lookup(each.value, "max_surge", 1)
582-
max_unavailable = lookup(each.value, "max_unavailable", 0)
580+
strategy = lookup(upgrade_settings.value, "strategy", "SURGE")
581+
max_surge = lookup(upgrade_settings.value, "max_surge", 1)
582+
max_unavailable = lookup(upgrade_settings.value, "max_unavailable", 0)
583583
}
584584
}
585585

586586
dynamic "upgrade_settings" {
587-
for_each = lookup(each.value, "strategy", var.strategy) == "BLUE_GREEN" ? [each.value] : []
587+
for_each = lookup(each.value, "strategy", "SURGE") == "BLUE_GREEN" ? [each.value] : []
588588
content {
589-
strategy = lookup(each.value, "strategy", "BLUE_GREEN")
589+
strategy = lookup(upgrade_settings.value, "strategy")
590590

591591
blue_green_settings {
592-
node_pool_soak_duration = lookup(each.value, "node_pool_soak_duration", "3600s")
592+
node_pool_soak_duration = lookup(upgrade_settings.value, "node_pool_soak_duration", "3600s")
593593

594594
standard_rollout_policy {
595-
batch_soak_duration = lookup(each.value, "batch_soak_duration", "60s")
596-
batch_percentage = lookup(each.value, "batch_percentage", null)
597-
batch_node_count = lookup(each.value, "batch_node_count", null)
595+
batch_soak_duration = lookup(upgrade_settings.value, "batch_soak_duration", "60s")
596+
batch_percentage = lookup(upgrade_settings.value, "batch_percentage", null)
597+
batch_node_count = lookup(upgrade_settings.value, "batch_node_count", null)
598598
}
599599
}
600600
}
@@ -807,26 +807,26 @@ resource "google_container_node_pool" "windows_pools" {
807807
}
808808

809809
dynamic "upgrade_settings" {
810-
for_each = lookup(each.value, "strategy", var.strategy) == "SURGE" ? [each.value] : []
810+
for_each = lookup(each.value, "strategy", "SURGE") == "SURGE" ? [each.value] : []
811811
content {
812-
strategy = lookup(each.value, "strategy", "SURGE")
813-
max_surge = lookup(each.value, "max_surge", 1)
814-
max_unavailable = lookup(each.value, "max_unavailable", 0)
812+
strategy = lookup(upgrade_settings.value, "strategy", "SURGE")
813+
max_surge = lookup(upgrade_settings.value, "max_surge", 1)
814+
max_unavailable = lookup(upgrade_settings.value, "max_unavailable", 0)
815815
}
816816
}
817817

818818
dynamic "upgrade_settings" {
819-
for_each = lookup(each.value, "strategy", var.strategy) == "BLUE_GREEN" ? [each.value] : []
819+
for_each = lookup(each.value, "strategy", "SURGE") == "BLUE_GREEN" ? [each.value] : []
820820
content {
821-
strategy = lookup(each.value, "strategy", "BLUE_GREEN")
821+
strategy = lookup(upgrade_settings.value, "strategy")
822822

823823
blue_green_settings {
824-
node_pool_soak_duration = lookup(each.value, "node_pool_soak_duration", "3600s")
824+
node_pool_soak_duration = lookup(upgrade_settings.value, "node_pool_soak_duration", "3600s")
825825

826826
standard_rollout_policy {
827-
batch_soak_duration = lookup(each.value, "batch_soak_duration", "60s")
828-
batch_percentage = lookup(each.value, "batch_percentage", null)
829-
batch_node_count = lookup(each.value, "batch_node_count", null)
827+
batch_soak_duration = lookup(upgrade_settings.value, "batch_soak_duration", "60s")
828+
batch_percentage = lookup(upgrade_settings.value, "batch_percentage", null)
829+
batch_node_count = lookup(upgrade_settings.value, "batch_node_count", null)
830830
}
831831
}
832832
}

0 commit comments

Comments
 (0)