Backport change from a0cfbae

terraform-google-modules · Jan 10, 2019 · 11588c7 · 11588c7
1 parent 428c56c
commit 11588c7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cluster_regional.tf b/cluster_regional.tf
@@ -95,7 +95,7 @@ resource "google_container_node_pool" "pools" {
   region             = "${var.region}"
   cluster            = "${var.name}"
   version            = "${lookup(var.node_pools[count.index], "auto_upgrade", false) ? "" : lookup(var.node_pools[count.index], "version", local.node_version)}"
-  initial_node_count = "${lookup(var.node_pools[count.index], "min_count", 1)}"
+  initial_node_count = "${lookup(var.node_pools[count.index], "initial_node_count", lookup(var.node_pools[count.index], "min_count", 1))}"
 
   autoscaling {
     min_node_count = "${lookup(var.node_pools[count.index], "min_count", 1)}"

diff --git a/cluster_zonal.tf b/cluster_zonal.tf
@@ -95,7 +95,7 @@ resource "google_container_node_pool" "zonal_pools" {
   zone               = "${var.zones[0]}"
   cluster            = "${var.name}"
   version            = "${lookup(var.node_pools[count.index], "auto_upgrade", false) ? "" : lookup(var.node_pools[count.index], "version", local.node_version)}"
-  initial_node_count = "${lookup(var.node_pools[count.index], "min_count", 1)}"
+  initial_node_count = "${lookup(var.node_pools[count.index], "initial_node_count", lookup(var.node_pools[count.index], "min_count", 1))}"
 
   autoscaling {
     min_node_count = "${lookup(var.node_pools[count.index], "min_count", 1)}"