WIP autoscaling opt out

Dev25 · Dev25 · commit b2a0f59ee8ea · 2019-08-28T11:58:19.000+01:00
diff --git a/autogen/cluster.tf b/autogen/cluster.tf
@@ -223,9 +223,11 @@ resource "google_container_node_pool" "pools" {
   max_pods_per_node = lookup(var.node_pools[count.index], "max_pods_per_node", null)
   {% endif %}
 
-  autoscaling {
-    min_node_count = lookup(var.node_pools[count.index], "min_count", 1)
-    max_node_count = lookup(var.node_pools[count.index], "max_count", 100)
+  node_count = lookup(var.node_pools[count.index], "autoscaling", true) ? null : lookup(var.node_pools[count.index], "min_count", 1)
+  dynamic "autoscaling" {
+    for_each = lookup(var.node_pools[count.index], "autoscaling", true) ? [var.node_pools[count.index]] : []
+    min_node_count = autoscaling.value.min_count
+    max_node_count = autoscaling.value.max_count
   }
 
   management {
diff --git a/autogen/variables.tf b/autogen/variables.tf
@@ -377,7 +377,7 @@ variable "enable_intranode_visibility" {
   default     = false
 }
 
- variable "enable_vertical_pod_autoscaling" {
+variable "enable_vertical_pod_autoscaling" {
   type        = bool
   description = "Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it"
   default     = false
diff --git a/cluster.tf b/cluster.tf
@@ -142,9 +142,11 @@ resource "google_container_node_pool" "pools" {
     lookup(var.node_pools[count.index], "min_count", 1),
   )
 
-  autoscaling {
-    min_node_count = lookup(var.node_pools[count.index], "min_count", 1)
-    max_node_count = lookup(var.node_pools[count.index], "max_count", 100)
+  node_count = lookup(var.node_pools[count.index], "autoscaling", true) ? null : lookup(var.node_pools[count.index], "min_count", 1)
+  dynamic "autoscaling" {
+    for_each       = lookup(var.node_pools[count.index], "autoscaling", true) ? [var.node_pools[count.index]] : []
+    min_node_count = autoscaling.value.min_count
+    max_node_count = autoscaling.value.max_count
   }
 
   management {
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -207,9 +207,11 @@ resource "google_container_node_pool" "pools" {
   )
   max_pods_per_node = lookup(var.node_pools[count.index], "max_pods_per_node", null)
 
-  autoscaling {
-    min_node_count = lookup(var.node_pools[count.index], "min_count", 1)
-    max_node_count = lookup(var.node_pools[count.index], "max_count", 100)
+  node_count = lookup(var.node_pools[count.index], "autoscaling", true) ? null : lookup(var.node_pools[count.index], "min_count", 1)
+  dynamic "autoscaling" {
+    for_each       = lookup(var.node_pools[count.index], "autoscaling", true) ? [var.node_pools[count.index]] : []
+    min_node_count = autoscaling.value.min_count
+    max_node_count = autoscaling.value.max_count
   }
 
   management {
diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -202,9 +202,11 @@ resource "google_container_node_pool" "pools" {
   )
   max_pods_per_node = lookup(var.node_pools[count.index], "max_pods_per_node", null)
 
-  autoscaling {
-    min_node_count = lookup(var.node_pools[count.index], "min_count", 1)
-    max_node_count = lookup(var.node_pools[count.index], "max_count", 100)
+  node_count = lookup(var.node_pools[count.index], "autoscaling", true) ? null : lookup(var.node_pools[count.index], "min_count", 1)
+  dynamic "autoscaling" {
+    for_each       = lookup(var.node_pools[count.index], "autoscaling", true) ? [var.node_pools[count.index]] : []
+    min_node_count = autoscaling.value.min_count
+    max_node_count = autoscaling.value.max_count
   }
 
   management {
diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -147,9 +147,11 @@ resource "google_container_node_pool" "pools" {
     lookup(var.node_pools[count.index], "min_count", 1),
   )
 
-  autoscaling {
-    min_node_count = lookup(var.node_pools[count.index], "min_count", 1)
-    max_node_count = lookup(var.node_pools[count.index], "max_count", 100)
+  node_count = lookup(var.node_pools[count.index], "autoscaling", true) ? null : lookup(var.node_pools[count.index], "min_count", 1)
+  dynamic "autoscaling" {
+    for_each       = lookup(var.node_pools[count.index], "autoscaling", true) ? [var.node_pools[count.index]] : []
+    min_node_count = autoscaling.value.min_count
+    max_node_count = autoscaling.value.max_count
   }
 
   management {

Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,7 @@ variable "enable_intranode_visibility" {`
`377`	`377`	`default = false`
`378`	`378`	`}`
`379`	`379`
`380`		`- variable "enable_vertical_pod_autoscaling" {`
	`380`	`+variable "enable_vertical_pod_autoscaling" {`
`381`	`381`	`type = bool`
`382`	`382`	`description = "Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it"`
`383`	`383`	`default = false`
Original file line number	Diff line number	Diff line change
`@@ -142,9 +142,11 @@ resource "google_container_node_pool" "pools" {`
`142`	`142`	`lookup(var.node_pools[count.index], "min_count", 1),`
`143`	`143`	`)`
`144`	`144`
`145`		`- autoscaling {`
`146`		`- min_node_count = lookup(var.node_pools[count.index], "min_count", 1)`
`147`		`- max_node_count = lookup(var.node_pools[count.index], "max_count", 100)`
	`145`	`+ node_count = lookup(var.node_pools[count.index], "autoscaling", true) ? null : lookup(var.node_pools[count.index], "min_count", 1)`
	`146`	`+ dynamic "autoscaling" {`
	`147`	`+ for_each = lookup(var.node_pools[count.index], "autoscaling", true) ? [var.node_pools[count.index]] : []`
	`148`	`+ min_node_count = autoscaling.value.min_count`
	`149`	`+ max_node_count = autoscaling.value.max_count`
`148`	`150`	`}`
`149`	`151`
`150`	`152`	`management {`
Original file line number	Diff line number	Diff line change
`@@ -207,9 +207,11 @@ resource "google_container_node_pool" "pools" {`
`207`	`207`	`)`
`208`	`208`	`max_pods_per_node = lookup(var.node_pools[count.index], "max_pods_per_node", null)`
`209`	`209`
`210`		`- autoscaling {`
`211`		`- min_node_count = lookup(var.node_pools[count.index], "min_count", 1)`
`212`		`- max_node_count = lookup(var.node_pools[count.index], "max_count", 100)`
	`210`	`+ node_count = lookup(var.node_pools[count.index], "autoscaling", true) ? null : lookup(var.node_pools[count.index], "min_count", 1)`
	`211`	`+ dynamic "autoscaling" {`
	`212`	`+ for_each = lookup(var.node_pools[count.index], "autoscaling", true) ? [var.node_pools[count.index]] : []`
	`213`	`+ min_node_count = autoscaling.value.min_count`
	`214`	`+ max_node_count = autoscaling.value.max_count`
`213`	`215`	`}`
`214`	`216`
`215`	`217`	`management {`
Original file line number	Diff line number	Diff line change
`@@ -202,9 +202,11 @@ resource "google_container_node_pool" "pools" {`
`202`	`202`	`)`
`203`	`203`	`max_pods_per_node = lookup(var.node_pools[count.index], "max_pods_per_node", null)`
`204`	`204`
`205`		`- autoscaling {`
`206`		`- min_node_count = lookup(var.node_pools[count.index], "min_count", 1)`
`207`		`- max_node_count = lookup(var.node_pools[count.index], "max_count", 100)`
	`205`	`+ node_count = lookup(var.node_pools[count.index], "autoscaling", true) ? null : lookup(var.node_pools[count.index], "min_count", 1)`
	`206`	`+ dynamic "autoscaling" {`
	`207`	`+ for_each = lookup(var.node_pools[count.index], "autoscaling", true) ? [var.node_pools[count.index]] : []`
	`208`	`+ min_node_count = autoscaling.value.min_count`
	`209`	`+ max_node_count = autoscaling.value.max_count`
`208`	`210`	`}`
`209`	`211`
`210`	`212`	`management {`
Original file line number	Diff line number	Diff line change
`@@ -147,9 +147,11 @@ resource "google_container_node_pool" "pools" {`
`147`	`147`	`lookup(var.node_pools[count.index], "min_count", 1),`
`148`	`148`	`)`
`149`	`149`
`150`		`- autoscaling {`
`151`		`- min_node_count = lookup(var.node_pools[count.index], "min_count", 1)`
`152`		`- max_node_count = lookup(var.node_pools[count.index], "max_count", 100)`
	`150`	`+ node_count = lookup(var.node_pools[count.index], "autoscaling", true) ? null : lookup(var.node_pools[count.index], "min_count", 1)`
	`151`	`+ dynamic "autoscaling" {`
	`152`	`+ for_each = lookup(var.node_pools[count.index], "autoscaling", true) ? [var.node_pools[count.index]] : []`
	`153`	`+ min_node_count = autoscaling.value.min_count`
	`154`	`+ max_node_count = autoscaling.value.max_count`
`153`	`155`	`}`
`154`	`156`
`155`	`157`	`management {`