Skip to content

Commit f57f3ce

Browse files
jmymyjmymy
authored
feat: add nodepool autoscaling vars avail in GKE 1.24.1 (#1415)
1 parent 0e8ff25 commit f57f3ce

File tree

8 files changed

+72
-42
lines changed

8 files changed

+72
-42
lines changed

‎autogen/main/cluster.tf.tmpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,8 @@ resource "google_container_node_pool" "windows_pools" {
633633
min_node_count = lookup(autoscaling.value, "min_count", 1)
634634
max_node_count = lookup(autoscaling.value, "max_count", 100)
635635
location_policy = lookup(autoscaling.value, "location_policy", null)
636+
total_min_node_count = lookup(autoscaling.value, "total_min_count", null)
637+
total_max_node_count = lookup(autoscaling.value, "total_max_count", null)
636638
}
637639
}
638640

‎cluster.tf

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -331,9 +331,11 @@ 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)
336-
location_policy = lookup(autoscaling.value, "location_policy", null)
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)
337+
total_min_node_count = lookup(autoscaling.value, "total_min_count", null)
338+
total_max_node_count = lookup(autoscaling.value, "total_max_count", null)
337339
}
338340
}
339341

@@ -484,9 +486,11 @@ resource "google_container_node_pool" "windows_pools" {
484486
dynamic "autoscaling" {
485487
for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
486488
content {
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)
489+
min_node_count = lookup(autoscaling.value, "min_count", 1)
490+
max_node_count = lookup(autoscaling.value, "max_count", 100)
491+
location_policy = lookup(autoscaling.value, "location_policy", null)
492+
total_min_node_count = lookup(autoscaling.value, "total_min_count", null)
493+
total_max_node_count = lookup(autoscaling.value, "total_max_count", null)
490494
}
491495
}
492496

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -552,9 +552,11 @@ resource "google_container_node_pool" "pools" {
552552
dynamic "autoscaling" {
553553
for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
554554
content {
555-
min_node_count = lookup(autoscaling.value, "min_count", 1)
556-
max_node_count = lookup(autoscaling.value, "max_count", 100)
557-
location_policy = lookup(autoscaling.value, "location_policy", null)
555+
min_node_count = lookup(autoscaling.value, "min_count", 1)
556+
max_node_count = lookup(autoscaling.value, "max_count", 100)
557+
location_policy = lookup(autoscaling.value, "location_policy", null)
558+
total_min_node_count = lookup(autoscaling.value, "total_min_count", null)
559+
total_max_node_count = lookup(autoscaling.value, "total_max_count", null)
558560
}
559561
}
560562

@@ -758,9 +760,11 @@ resource "google_container_node_pool" "windows_pools" {
758760
dynamic "autoscaling" {
759761
for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
760762
content {
761-
min_node_count = lookup(autoscaling.value, "min_count", 1)
762-
max_node_count = lookup(autoscaling.value, "max_count", 100)
763-
location_policy = lookup(autoscaling.value, "location_policy", null)
763+
min_node_count = lookup(autoscaling.value, "min_count", 1)
764+
max_node_count = lookup(autoscaling.value, "max_count", 100)
765+
location_policy = lookup(autoscaling.value, "location_policy", null)
766+
total_min_node_count = lookup(autoscaling.value, "total_min_count", null)
767+
total_max_node_count = lookup(autoscaling.value, "total_max_count", null)
764768
}
765769
}
766770

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -458,9 +458,11 @@ 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)
463-
location_policy = lookup(autoscaling.value, "location_policy", null)
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)
464+
total_min_node_count = lookup(autoscaling.value, "total_min_count", null)
465+
total_max_node_count = lookup(autoscaling.value, "total_max_count", null)
464466
}
465467
}
466468

@@ -663,9 +665,11 @@ resource "google_container_node_pool" "windows_pools" {
663665
dynamic "autoscaling" {
664666
for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
665667
content {
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)
668+
min_node_count = lookup(autoscaling.value, "min_count", 1)
669+
max_node_count = lookup(autoscaling.value, "max_count", 100)
670+
location_policy = lookup(autoscaling.value, "location_policy", null)
671+
total_min_node_count = lookup(autoscaling.value, "total_min_count", null)
672+
total_max_node_count = lookup(autoscaling.value, "total_max_count", null)
669673
}
670674
}
671675

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -533,9 +533,11 @@ resource "google_container_node_pool" "pools" {
533533
dynamic "autoscaling" {
534534
for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
535535
content {
536-
min_node_count = lookup(autoscaling.value, "min_count", 1)
537-
max_node_count = lookup(autoscaling.value, "max_count", 100)
538-
location_policy = lookup(autoscaling.value, "location_policy", null)
536+
min_node_count = lookup(autoscaling.value, "min_count", 1)
537+
max_node_count = lookup(autoscaling.value, "max_count", 100)
538+
location_policy = lookup(autoscaling.value, "location_policy", null)
539+
total_min_node_count = lookup(autoscaling.value, "total_min_count", null)
540+
total_max_node_count = lookup(autoscaling.value, "total_max_count", null)
539541
}
540542
}
541543

@@ -739,9 +741,11 @@ resource "google_container_node_pool" "windows_pools" {
739741
dynamic "autoscaling" {
740742
for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
741743
content {
742-
min_node_count = lookup(autoscaling.value, "min_count", 1)
743-
max_node_count = lookup(autoscaling.value, "max_count", 100)
744-
location_policy = lookup(autoscaling.value, "location_policy", null)
744+
min_node_count = lookup(autoscaling.value, "min_count", 1)
745+
max_node_count = lookup(autoscaling.value, "max_count", 100)
746+
location_policy = lookup(autoscaling.value, "location_policy", null)
747+
total_min_node_count = lookup(autoscaling.value, "total_min_count", null)
748+
total_max_node_count = lookup(autoscaling.value, "total_max_count", null)
745749
}
746750
}
747751

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -439,9 +439,11 @@ 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)
444-
location_policy = lookup(autoscaling.value, "location_policy", null)
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)
445+
total_min_node_count = lookup(autoscaling.value, "total_min_count", null)
446+
total_max_node_count = lookup(autoscaling.value, "total_max_count", null)
445447
}
446448
}
447449

@@ -644,9 +646,11 @@ resource "google_container_node_pool" "windows_pools" {
644646
dynamic "autoscaling" {
645647
for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
646648
content {
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)
649+
min_node_count = lookup(autoscaling.value, "min_count", 1)
650+
max_node_count = lookup(autoscaling.value, "max_count", 100)
651+
location_policy = lookup(autoscaling.value, "location_policy", null)
652+
total_min_node_count = lookup(autoscaling.value, "total_min_count", null)
653+
total_max_node_count = lookup(autoscaling.value, "total_max_count", null)
650654
}
651655
}
652656

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -444,9 +444,11 @@ resource "google_container_node_pool" "pools" {
444444
dynamic "autoscaling" {
445445
for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
446446
content {
447-
min_node_count = lookup(autoscaling.value, "min_count", 1)
448-
max_node_count = lookup(autoscaling.value, "max_count", 100)
449-
location_policy = lookup(autoscaling.value, "location_policy", null)
447+
min_node_count = lookup(autoscaling.value, "min_count", 1)
448+
max_node_count = lookup(autoscaling.value, "max_count", 100)
449+
location_policy = lookup(autoscaling.value, "location_policy", null)
450+
total_min_node_count = lookup(autoscaling.value, "total_min_count", null)
451+
total_max_node_count = lookup(autoscaling.value, "total_max_count", null)
450452
}
451453
}
452454

@@ -598,9 +600,11 @@ resource "google_container_node_pool" "windows_pools" {
598600
dynamic "autoscaling" {
599601
for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
600602
content {
601-
min_node_count = lookup(autoscaling.value, "min_count", 1)
602-
max_node_count = lookup(autoscaling.value, "max_count", 100)
603-
location_policy = lookup(autoscaling.value, "location_policy", null)
603+
min_node_count = lookup(autoscaling.value, "min_count", 1)
604+
max_node_count = lookup(autoscaling.value, "max_count", 100)
605+
location_policy = lookup(autoscaling.value, "location_policy", null)
606+
total_min_node_count = lookup(autoscaling.value, "total_min_count", null)
607+
total_max_node_count = lookup(autoscaling.value, "total_max_count", null)
604608
}
605609
}
606610

‎modules/private-cluster/cluster.tf

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -350,9 +350,11 @@ resource "google_container_node_pool" "pools" {
350350
dynamic "autoscaling" {
351351
for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
352352
content {
353-
min_node_count = lookup(autoscaling.value, "min_count", 1)
354-
max_node_count = lookup(autoscaling.value, "max_count", 100)
355-
location_policy = lookup(autoscaling.value, "location_policy", null)
353+
min_node_count = lookup(autoscaling.value, "min_count", 1)
354+
max_node_count = lookup(autoscaling.value, "max_count", 100)
355+
location_policy = lookup(autoscaling.value, "location_policy", null)
356+
total_min_node_count = lookup(autoscaling.value, "total_min_count", null)
357+
total_max_node_count = lookup(autoscaling.value, "total_max_count", null)
356358
}
357359
}
358360

@@ -503,9 +505,11 @@ resource "google_container_node_pool" "windows_pools" {
503505
dynamic "autoscaling" {
504506
for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
505507
content {
506-
min_node_count = lookup(autoscaling.value, "min_count", 1)
507-
max_node_count = lookup(autoscaling.value, "max_count", 100)
508-
location_policy = lookup(autoscaling.value, "location_policy", null)
508+
min_node_count = lookup(autoscaling.value, "min_count", 1)
509+
max_node_count = lookup(autoscaling.value, "max_count", 100)
510+
location_policy = lookup(autoscaling.value, "location_policy", null)
511+
total_min_node_count = lookup(autoscaling.value, "total_min_count", null)
512+
total_max_node_count = lookup(autoscaling.value, "total_max_count", null)
509513
}
510514
}
511515

0 commit comments

Comments
 (0)