Make min/max optional vars

Dev25 · Dev25 · commit 773eb570ed1b · 2019-08-28T12:05:16.000+01:00
diff --git a/autogen/cluster.tf b/autogen/cluster.tf
@@ -228,8 +228,8 @@ resource "google_container_node_pool" "pools" {
   dynamic "autoscaling" {
     for_each = lookup(var.node_pools[count.index], "autoscaling", true) ? [var.node_pools[count.index]] : []
     content {
-      min_node_count = autoscaling.value.min_count
-     max_node_count = autoscaling.value.max_count
+      min_node_count = lookup(autoscaling.value, "min_count", 1)
+      max_node_count = lookup(autoscaling.value, "max_count", 100)
     }
   }
 
diff --git a/cluster.tf b/cluster.tf
@@ -147,8 +147,8 @@ resource "google_container_node_pool" "pools" {
   dynamic "autoscaling" {
     for_each = lookup(var.node_pools[count.index], "autoscaling", true) ? [var.node_pools[count.index]] : []
     content {
-      min_node_count = autoscaling.value.min_count
-      max_node_count = autoscaling.value.max_count
+      min_node_count = lookup(autoscaling.value, "min_count", 1)
+      max_node_count = lookup(autoscaling.value, "max_count", 100)
     }
   }
 
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -212,8 +212,8 @@ resource "google_container_node_pool" "pools" {
   dynamic "autoscaling" {
     for_each = lookup(var.node_pools[count.index], "autoscaling", true) ? [var.node_pools[count.index]] : []
     content {
-      min_node_count = autoscaling.value.min_count
-      max_node_count = autoscaling.value.max_count
+      min_node_count = lookup(autoscaling.value, "min_count", 1)
+      max_node_count = lookup(autoscaling.value, "max_count", 100)
     }
   }
 
diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -207,8 +207,8 @@ resource "google_container_node_pool" "pools" {
   dynamic "autoscaling" {
     for_each = lookup(var.node_pools[count.index], "autoscaling", true) ? [var.node_pools[count.index]] : []
     content {
-      min_node_count = autoscaling.value.min_count
-      max_node_count = autoscaling.value.max_count
+      min_node_count = lookup(autoscaling.value, "min_count", 1)
+      max_node_count = lookup(autoscaling.value, "max_count", 100)
     }
   }
 
diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -152,8 +152,8 @@ resource "google_container_node_pool" "pools" {
   dynamic "autoscaling" {
     for_each = lookup(var.node_pools[count.index], "autoscaling", true) ? [var.node_pools[count.index]] : []
     content {
-      min_node_count = autoscaling.value.min_count
-      max_node_count = autoscaling.value.max_count
+      min_node_count = lookup(autoscaling.value, "min_count", 1)
+      max_node_count = lookup(autoscaling.value, "max_count", 100)
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -228,8 +228,8 @@ resource "google_container_node_pool" "pools" {`
`228`	`228`	`dynamic "autoscaling" {`
`229`	`229`	`for_each = lookup(var.node_pools[count.index], "autoscaling", true) ? [var.node_pools[count.index]] : []`
`230`	`230`	`content {`
`231`		`- min_node_count = autoscaling.value.min_count`
`232`		`- max_node_count = autoscaling.value.max_count`
	`231`	`+ min_node_count = lookup(autoscaling.value, "min_count", 1)`
	`232`	`+ max_node_count = lookup(autoscaling.value, "max_count", 100)`
`233`	`233`	`}`
`234`	`234`	`}`
`235`	`235`
Original file line number	Diff line number	Diff line change
`@@ -147,8 +147,8 @@ resource "google_container_node_pool" "pools" {`
`147`	`147`	`dynamic "autoscaling" {`
`148`	`148`	`for_each = lookup(var.node_pools[count.index], "autoscaling", true) ? [var.node_pools[count.index]] : []`
`149`	`149`	`content {`
`150`		`- min_node_count = autoscaling.value.min_count`
`151`		`- max_node_count = autoscaling.value.max_count`
	`150`	`+ min_node_count = lookup(autoscaling.value, "min_count", 1)`
	`151`	`+ max_node_count = lookup(autoscaling.value, "max_count", 100)`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`
Original file line number	Diff line number	Diff line change
`@@ -212,8 +212,8 @@ resource "google_container_node_pool" "pools" {`
`212`	`212`	`dynamic "autoscaling" {`
`213`	`213`	`for_each = lookup(var.node_pools[count.index], "autoscaling", true) ? [var.node_pools[count.index]] : []`
`214`	`214`	`content {`
`215`		`- min_node_count = autoscaling.value.min_count`
`216`		`- max_node_count = autoscaling.value.max_count`
	`215`	`+ min_node_count = lookup(autoscaling.value, "min_count", 1)`
	`216`	`+ max_node_count = lookup(autoscaling.value, "max_count", 100)`
`217`	`217`	`}`
`218`	`218`	`}`
`219`	`219`
Original file line number	Diff line number	Diff line change
`@@ -207,8 +207,8 @@ resource "google_container_node_pool" "pools" {`
`207`	`207`	`dynamic "autoscaling" {`
`208`	`208`	`for_each = lookup(var.node_pools[count.index], "autoscaling", true) ? [var.node_pools[count.index]] : []`
`209`	`209`	`content {`
`210`		`- min_node_count = autoscaling.value.min_count`
`211`		`- max_node_count = autoscaling.value.max_count`
	`210`	`+ min_node_count = lookup(autoscaling.value, "min_count", 1)`
	`211`	`+ max_node_count = lookup(autoscaling.value, "max_count", 100)`
`212`	`212`	`}`
`213`	`213`	`}`
`214`	`214`
Original file line number	Diff line number	Diff line change
`@@ -152,8 +152,8 @@ resource "google_container_node_pool" "pools" {`
`152`	`152`	`dynamic "autoscaling" {`
`153`	`153`	`for_each = lookup(var.node_pools[count.index], "autoscaling", true) ? [var.node_pools[count.index]] : []`
`154`	`154`	`content {`
`155`		`- min_node_count = autoscaling.value.min_count`
`156`		`- max_node_count = autoscaling.value.max_count`
	`155`	`+ min_node_count = lookup(autoscaling.value, "min_count", 1)`
	`156`	`+ max_node_count = lookup(autoscaling.value, "max_count", 100)`
`157`	`157`	`}`
`158`	`158`	`}`
`159`	`159`