From f57f3ce58de14076a03182aa3b37aae58beac29a Mon Sep 17 00:00:00 2001 From: Jonathan Meyers Date: Fri, 18 Nov 2022 17:36:36 +0000 Subject: [PATCH] feat: add nodepool autoscaling vars avail in GKE 1.24.1 (#1415) --- autogen/main/cluster.tf.tmpl | 2 ++ cluster.tf | 16 ++++++++++------ .../cluster.tf | 16 ++++++++++------ modules/beta-private-cluster/cluster.tf | 16 ++++++++++------ .../cluster.tf | 16 ++++++++++------ modules/beta-public-cluster/cluster.tf | 16 ++++++++++------ .../private-cluster-update-variant/cluster.tf | 16 ++++++++++------ modules/private-cluster/cluster.tf | 16 ++++++++++------ 8 files changed, 72 insertions(+), 42 deletions(-) diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl index 7354fe97f..1b53e0239 100644 --- 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 index c9d1bb41a..172103884 100644 --- 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 index 0f9aca50e..49414a852 100644 --- 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 index 973e78dba..b54bd84d1 100644 --- 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 index 23e0a18d1..182e52871 100644 --- 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 index 0bf245fc5..648303400 100644 --- 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 index 9579ace53..a9a4da2ed 100644 --- 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 index e2f369d37..f81d5a5b0 100644 --- 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) } }