feat: add nodepool autoscaling vars avail in GKE 1.24.1 (#1415)

terraform-google-modules · Nov 18, 2022 · f57f3ce · f57f3ce
1 parent 0e8ff25
commit f57f3ce
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 42 deletions.
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -633,6 +633,8 @@ resource "google_container_node_pool" "windows_pools" {
       min_node_count = lookup(autoscaling.value, "min_count", 1)
       max_node_count = lookup(autoscaling.value, "max_count", 100)
       location_policy = lookup(autoscaling.value, "location_policy", null)
+      total_min_node_count = lookup(autoscaling.value, "total_min_count", null)
+      total_max_node_count = lookup(autoscaling.value, "total_max_count", null)
     }
   }
 

diff --git a/cluster.tf b/cluster.tf
@@ -331,9 +331,11 @@ resource "google_container_node_pool" "pools" {
   dynamic "autoscaling" {
     for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
     content {
-      min_node_count  = lookup(autoscaling.value, "min_count", 1)
-      max_node_count  = lookup(autoscaling.value, "max_count", 100)
-      location_policy = lookup(autoscaling.value, "location_policy", null)
+      min_node_count       = lookup(autoscaling.value, "min_count", 1)
+      max_node_count       = lookup(autoscaling.value, "max_count", 100)
+      location_policy      = lookup(autoscaling.value, "location_policy", null)
+      total_min_node_count = lookup(autoscaling.value, "total_min_count", null)
+      total_max_node_count = lookup(autoscaling.value, "total_max_count", null)
     }
   }
 
@@ -484,9 +486,11 @@ resource "google_container_node_pool" "windows_pools" {
   dynamic "autoscaling" {
     for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
     content {
-      min_node_count  = lookup(autoscaling.value, "min_count", 1)
-      max_node_count  = lookup(autoscaling.value, "max_count", 100)
-      location_policy = lookup(autoscaling.value, "location_policy", null)
+      min_node_count       = lookup(autoscaling.value, "min_count", 1)
+      max_node_count       = lookup(autoscaling.value, "max_count", 100)
+      location_policy      = lookup(autoscaling.value, "location_policy", null)
+      total_min_node_count = lookup(autoscaling.value, "total_min_count", null)
+      total_max_node_count = lookup(autoscaling.value, "total_max_count", null)
     }
   }
 

diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -552,9 +552,11 @@ resource "google_container_node_pool" "pools" {
   dynamic "autoscaling" {
     for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
     content {
-      min_node_count  = lookup(autoscaling.value, "min_count", 1)
-      max_node_count  = lookup(autoscaling.value, "max_count", 100)
-      location_policy = lookup(autoscaling.value, "location_policy", null)
+      min_node_count       = lookup(autoscaling.value, "min_count", 1)
+      max_node_count       = lookup(autoscaling.value, "max_count", 100)
+      location_policy      = lookup(autoscaling.value, "location_policy", null)
+      total_min_node_count = lookup(autoscaling.value, "total_min_count", null)
+      total_max_node_count = lookup(autoscaling.value, "total_max_count", null)
     }
   }
 
@@ -758,9 +760,11 @@ resource "google_container_node_pool" "windows_pools" {
   dynamic "autoscaling" {
     for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
     content {
-      min_node_count  = lookup(autoscaling.value, "min_count", 1)
-      max_node_count  = lookup(autoscaling.value, "max_count", 100)
-      location_policy = lookup(autoscaling.value, "location_policy", null)
+      min_node_count       = lookup(autoscaling.value, "min_count", 1)
+      max_node_count       = lookup(autoscaling.value, "max_count", 100)
+      location_policy      = lookup(autoscaling.value, "location_policy", null)
+      total_min_node_count = lookup(autoscaling.value, "total_min_count", null)
+      total_max_node_count = lookup(autoscaling.value, "total_max_count", null)
     }
   }
 

diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -458,9 +458,11 @@ resource "google_container_node_pool" "pools" {
   dynamic "autoscaling" {
     for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
     content {
-      min_node_count  = lookup(autoscaling.value, "min_count", 1)
-      max_node_count  = lookup(autoscaling.value, "max_count", 100)
-      location_policy = lookup(autoscaling.value, "location_policy", null)
+      min_node_count       = lookup(autoscaling.value, "min_count", 1)
+      max_node_count       = lookup(autoscaling.value, "max_count", 100)
+      location_policy      = lookup(autoscaling.value, "location_policy", null)
+      total_min_node_count = lookup(autoscaling.value, "total_min_count", null)
+      total_max_node_count = lookup(autoscaling.value, "total_max_count", null)
     }
   }
 
@@ -663,9 +665,11 @@ resource "google_container_node_pool" "windows_pools" {
   dynamic "autoscaling" {
     for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
     content {
-      min_node_count  = lookup(autoscaling.value, "min_count", 1)
-      max_node_count  = lookup(autoscaling.value, "max_count", 100)
-      location_policy = lookup(autoscaling.value, "location_policy", null)
+      min_node_count       = lookup(autoscaling.value, "min_count", 1)
+      max_node_count       = lookup(autoscaling.value, "max_count", 100)
+      location_policy      = lookup(autoscaling.value, "location_policy", null)
+      total_min_node_count = lookup(autoscaling.value, "total_min_count", null)
+      total_max_node_count = lookup(autoscaling.value, "total_max_count", null)
     }
   }
 

diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -533,9 +533,11 @@ resource "google_container_node_pool" "pools" {
   dynamic "autoscaling" {
     for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
     content {
-      min_node_count  = lookup(autoscaling.value, "min_count", 1)
-      max_node_count  = lookup(autoscaling.value, "max_count", 100)
-      location_policy = lookup(autoscaling.value, "location_policy", null)
+      min_node_count       = lookup(autoscaling.value, "min_count", 1)
+      max_node_count       = lookup(autoscaling.value, "max_count", 100)
+      location_policy      = lookup(autoscaling.value, "location_policy", null)
+      total_min_node_count = lookup(autoscaling.value, "total_min_count", null)
+      total_max_node_count = lookup(autoscaling.value, "total_max_count", null)
     }
   }
 
@@ -739,9 +741,11 @@ resource "google_container_node_pool" "windows_pools" {
   dynamic "autoscaling" {
     for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
     content {
-      min_node_count  = lookup(autoscaling.value, "min_count", 1)
-      max_node_count  = lookup(autoscaling.value, "max_count", 100)
-      location_policy = lookup(autoscaling.value, "location_policy", null)
+      min_node_count       = lookup(autoscaling.value, "min_count", 1)
+      max_node_count       = lookup(autoscaling.value, "max_count", 100)
+      location_policy      = lookup(autoscaling.value, "location_policy", null)
+      total_min_node_count = lookup(autoscaling.value, "total_min_count", null)
+      total_max_node_count = lookup(autoscaling.value, "total_max_count", null)
     }
   }
 

diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -439,9 +439,11 @@ resource "google_container_node_pool" "pools" {
   dynamic "autoscaling" {
     for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
     content {
-      min_node_count  = lookup(autoscaling.value, "min_count", 1)
-      max_node_count  = lookup(autoscaling.value, "max_count", 100)
-      location_policy = lookup(autoscaling.value, "location_policy", null)
+      min_node_count       = lookup(autoscaling.value, "min_count", 1)
+      max_node_count       = lookup(autoscaling.value, "max_count", 100)
+      location_policy      = lookup(autoscaling.value, "location_policy", null)
+      total_min_node_count = lookup(autoscaling.value, "total_min_count", null)
+      total_max_node_count = lookup(autoscaling.value, "total_max_count", null)
     }
   }
 
@@ -644,9 +646,11 @@ resource "google_container_node_pool" "windows_pools" {
   dynamic "autoscaling" {
     for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
     content {
-      min_node_count  = lookup(autoscaling.value, "min_count", 1)
-      max_node_count  = lookup(autoscaling.value, "max_count", 100)
-      location_policy = lookup(autoscaling.value, "location_policy", null)
+      min_node_count       = lookup(autoscaling.value, "min_count", 1)
+      max_node_count       = lookup(autoscaling.value, "max_count", 100)
+      location_policy      = lookup(autoscaling.value, "location_policy", null)
+      total_min_node_count = lookup(autoscaling.value, "total_min_count", null)
+      total_max_node_count = lookup(autoscaling.value, "total_max_count", null)
     }
   }
 

diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -444,9 +444,11 @@ resource "google_container_node_pool" "pools" {
   dynamic "autoscaling" {
     for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
     content {
-      min_node_count  = lookup(autoscaling.value, "min_count", 1)
-      max_node_count  = lookup(autoscaling.value, "max_count", 100)
-      location_policy = lookup(autoscaling.value, "location_policy", null)
+      min_node_count       = lookup(autoscaling.value, "min_count", 1)
+      max_node_count       = lookup(autoscaling.value, "max_count", 100)
+      location_policy      = lookup(autoscaling.value, "location_policy", null)
+      total_min_node_count = lookup(autoscaling.value, "total_min_count", null)
+      total_max_node_count = lookup(autoscaling.value, "total_max_count", null)
     }
   }
 
@@ -598,9 +600,11 @@ resource "google_container_node_pool" "windows_pools" {
   dynamic "autoscaling" {
     for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
     content {
-      min_node_count  = lookup(autoscaling.value, "min_count", 1)
-      max_node_count  = lookup(autoscaling.value, "max_count", 100)
-      location_policy = lookup(autoscaling.value, "location_policy", null)
+      min_node_count       = lookup(autoscaling.value, "min_count", 1)
+      max_node_count       = lookup(autoscaling.value, "max_count", 100)
+      location_policy      = lookup(autoscaling.value, "location_policy", null)
+      total_min_node_count = lookup(autoscaling.value, "total_min_count", null)
+      total_max_node_count = lookup(autoscaling.value, "total_max_count", null)
     }
   }
 

diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -350,9 +350,11 @@ resource "google_container_node_pool" "pools" {
   dynamic "autoscaling" {
     for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
     content {
-      min_node_count  = lookup(autoscaling.value, "min_count", 1)
-      max_node_count  = lookup(autoscaling.value, "max_count", 100)
-      location_policy = lookup(autoscaling.value, "location_policy", null)
+      min_node_count       = lookup(autoscaling.value, "min_count", 1)
+      max_node_count       = lookup(autoscaling.value, "max_count", 100)
+      location_policy      = lookup(autoscaling.value, "location_policy", null)
+      total_min_node_count = lookup(autoscaling.value, "total_min_count", null)
+      total_max_node_count = lookup(autoscaling.value, "total_max_count", null)
     }
   }
 
@@ -503,9 +505,11 @@ resource "google_container_node_pool" "windows_pools" {
   dynamic "autoscaling" {
     for_each = lookup(each.value, "autoscaling", true) ? [each.value] : []
     content {
-      min_node_count  = lookup(autoscaling.value, "min_count", 1)
-      max_node_count  = lookup(autoscaling.value, "max_count", 100)
-      location_policy = lookup(autoscaling.value, "location_policy", null)
+      min_node_count       = lookup(autoscaling.value, "min_count", 1)
+      max_node_count       = lookup(autoscaling.value, "max_count", 100)
+      location_policy      = lookup(autoscaling.value, "location_policy", null)
+      total_min_node_count = lookup(autoscaling.value, "total_min_count", null)
+      total_max_node_count = lookup(autoscaling.value, "total_max_count", null)
     }
   }