Skip to content

Commit aecccf0

Browse files
bogaertgbogaertg
authored
feat: add location_policy and fix permadiff (terraform-google-modules#1452)
fix: location-policy permadrifting terraform-google-modules#1445
1 parent 92ebb00 commit aecccf0

File tree

8 files changed

+43
-28
lines changed

8 files changed

+43
-28
lines changed

‎autogen/main/cluster.tf.tmpl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -631,6 +631,7 @@ resource "google_container_node_pool" "windows_pools" {
631631
content {
632632
min_node_count = lookup(autoscaling.value, "min_count", 1)
633633
max_node_count = lookup(autoscaling.value, "max_count", 100)
634+
location_policy = lookup(autoscaling.value, "location_policy", null)
634635
}
635636
}
636637

‎cluster.tf‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -331,8 +331,9 @@ resource "google_container_node_pool" "pools" {
331331
dynamic "autoscaling" {
332332
for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
333333
content {
334-
min_node_count = lookup(autoscaling.value, "min_count", 1)
335-
max_node_count = lookup(autoscaling.value, "max_count", 100)
334+
min_node_count = lookup(autoscaling.value, "min_count", 1)
335+
max_node_count = lookup(autoscaling.value, "max_count", 100)
336+
location_policy = lookup(autoscaling.value, "location_policy", null)
336337
}
337338
}
338339

@@ -483,8 +484,9 @@ resource "google_container_node_pool" "windows_pools" {
483484
dynamic "autoscaling" {
484485
for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
485486
content {
486-
min_node_count = lookup(autoscaling.value, "min_count", 1)
487-
max_node_count = lookup(autoscaling.value, "max_count", 100)
487+
min_node_count = lookup(autoscaling.value, "min_count", 1)
488+
max_node_count = lookup(autoscaling.value, "max_count", 100)
489+
location_policy = lookup(autoscaling.value, "location_policy", null)
488490
}
489491
}
490492

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -549,8 +549,9 @@ resource "google_container_node_pool" "pools" {
549549
dynamic "autoscaling" {
550550
for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
551551
content {
552-
min_node_count = lookup(autoscaling.value, "min_count", 1)
553-
max_node_count = lookup(autoscaling.value, "max_count", 100)
552+
min_node_count = lookup(autoscaling.value, "min_count", 1)
553+
max_node_count = lookup(autoscaling.value, "max_count", 100)
554+
location_policy = lookup(autoscaling.value, "location_policy", null)
554555
}
555556
}
556557

@@ -754,8 +755,9 @@ resource "google_container_node_pool" "windows_pools" {
754755
dynamic "autoscaling" {
755756
for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
756757
content {
757-
min_node_count = lookup(autoscaling.value, "min_count", 1)
758-
max_node_count = lookup(autoscaling.value, "max_count", 100)
758+
min_node_count = lookup(autoscaling.value, "min_count", 1)
759+
max_node_count = lookup(autoscaling.value, "max_count", 100)
760+
location_policy = lookup(autoscaling.value, "location_policy", null)
759761
}
760762
}
761763

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -458,8 +458,9 @@ resource "google_container_node_pool" "pools" {
458458
dynamic "autoscaling" {
459459
for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
460460
content {
461-
min_node_count = lookup(autoscaling.value, "min_count", 1)
462-
max_node_count = lookup(autoscaling.value, "max_count", 100)
461+
min_node_count = lookup(autoscaling.value, "min_count", 1)
462+
max_node_count = lookup(autoscaling.value, "max_count", 100)
463+
location_policy = lookup(autoscaling.value, "location_policy", null)
463464
}
464465
}
465466

@@ -662,8 +663,9 @@ resource "google_container_node_pool" "windows_pools" {
662663
dynamic "autoscaling" {
663664
for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
664665
content {
665-
min_node_count = lookup(autoscaling.value, "min_count", 1)
666-
max_node_count = lookup(autoscaling.value, "max_count", 100)
666+
min_node_count = lookup(autoscaling.value, "min_count", 1)
667+
max_node_count = lookup(autoscaling.value, "max_count", 100)
668+
location_policy = lookup(autoscaling.value, "location_policy", null)
667669
}
668670
}
669671

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -530,8 +530,9 @@ resource "google_container_node_pool" "pools" {
530530
dynamic "autoscaling" {
531531
for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
532532
content {
533-
min_node_count = lookup(autoscaling.value, "min_count", 1)
534-
max_node_count = lookup(autoscaling.value, "max_count", 100)
533+
min_node_count = lookup(autoscaling.value, "min_count", 1)
534+
max_node_count = lookup(autoscaling.value, "max_count", 100)
535+
location_policy = lookup(autoscaling.value, "location_policy", null)
535536
}
536537
}
537538

@@ -735,8 +736,9 @@ resource "google_container_node_pool" "windows_pools" {
735736
dynamic "autoscaling" {
736737
for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
737738
content {
738-
min_node_count = lookup(autoscaling.value, "min_count", 1)
739-
max_node_count = lookup(autoscaling.value, "max_count", 100)
739+
min_node_count = lookup(autoscaling.value, "min_count", 1)
740+
max_node_count = lookup(autoscaling.value, "max_count", 100)
741+
location_policy = lookup(autoscaling.value, "location_policy", null)
740742
}
741743
}
742744

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -439,8 +439,9 @@ resource "google_container_node_pool" "pools" {
439439
dynamic "autoscaling" {
440440
for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
441441
content {
442-
min_node_count = lookup(autoscaling.value, "min_count", 1)
443-
max_node_count = lookup(autoscaling.value, "max_count", 100)
442+
min_node_count = lookup(autoscaling.value, "min_count", 1)
443+
max_node_count = lookup(autoscaling.value, "max_count", 100)
444+
location_policy = lookup(autoscaling.value, "location_policy", null)
444445
}
445446
}
446447

@@ -643,8 +644,9 @@ resource "google_container_node_pool" "windows_pools" {
643644
dynamic "autoscaling" {
644645
for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
645646
content {
646-
min_node_count = lookup(autoscaling.value, "min_count", 1)
647-
max_node_count = lookup(autoscaling.value, "max_count", 100)
647+
min_node_count = lookup(autoscaling.value, "min_count", 1)
648+
max_node_count = lookup(autoscaling.value, "max_count", 100)
649+
location_policy = lookup(autoscaling.value, "location_policy", null)
648650
}
649651
}
650652

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -435,8 +435,9 @@ resource "google_container_node_pool" "pools" {
435435
dynamic "autoscaling" {
436436
for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
437437
content {
438-
min_node_count = lookup(autoscaling.value, "min_count", 1)
439-
max_node_count = lookup(autoscaling.value, "max_count", 100)
438+
min_node_count = lookup(autoscaling.value, "min_count", 1)
439+
max_node_count = lookup(autoscaling.value, "max_count", 100)
440+
location_policy = lookup(autoscaling.value, "location_policy", null)
440441
}
441442
}
442443

@@ -588,8 +589,9 @@ resource "google_container_node_pool" "windows_pools" {
588589
dynamic "autoscaling" {
589590
for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
590591
content {
591-
min_node_count = lookup(autoscaling.value, "min_count", 1)
592-
max_node_count = lookup(autoscaling.value, "max_count", 100)
592+
min_node_count = lookup(autoscaling.value, "min_count", 1)
593+
max_node_count = lookup(autoscaling.value, "max_count", 100)
594+
location_policy = lookup(autoscaling.value, "location_policy", null)
593595
}
594596
}
595597

‎modules/private-cluster/cluster.tf‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,9 @@ resource "google_container_node_pool" "pools" {
344344
dynamic "autoscaling" {
345345
for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
346346
content {
347-
min_node_count = lookup(autoscaling.value, "min_count", 1)
348-
max_node_count = lookup(autoscaling.value, "max_count", 100)
347+
min_node_count = lookup(autoscaling.value, "min_count", 1)
348+
max_node_count = lookup(autoscaling.value, "max_count", 100)
349+
location_policy = lookup(autoscaling.value, "location_policy", null)
349350
}
350351
}
351352

@@ -496,8 +497,9 @@ resource "google_container_node_pool" "windows_pools" {
496497
dynamic "autoscaling" {
497498
for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
498499
content {
499-
min_node_count = lookup(autoscaling.value, "min_count", 1)
500-
max_node_count = lookup(autoscaling.value, "max_count", 100)
500+
min_node_count = lookup(autoscaling.value, "min_count", 1)
501+
max_node_count = lookup(autoscaling.value, "max_count", 100)
502+
location_policy = lookup(autoscaling.value, "location_policy", null)
501503
}
502504
}
503505

0 commit comments

Comments
 (0)