fix: set initial_node_count with remove_default_node_pool (#1228)

terraform-google-modules · Apr 18, 2022 · 151c8c4 · 151c8c4
1 parent f431756
commit 151c8c4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/autogen/safer-cluster/main.tf.tmpl b/autogen/safer-cluster/main.tf.tmpl
@@ -77,11 +77,11 @@ module "gke" {
 
   maintenance_start_time = var.maintenance_start_time
 
-  initial_node_count = var.initial_node_count
-
   // We suggest removing the default node pool, as it cannot be modified without
   // destroying the cluster.
   remove_default_node_pool = true
+  // If removing the default node pool, initial_node_count should be at least 1.
+  initial_node_count = (var.initial_node_count == 0) ? 1 : var.initial_node_count
 
   node_pools          = var.node_pools
   node_pools_labels   = var.node_pools_labels

diff --git a/modules/safer-cluster-update-variant/main.tf b/modules/safer-cluster-update-variant/main.tf
@@ -73,11 +73,11 @@ module "gke" {
 
   maintenance_start_time = var.maintenance_start_time
 
-  initial_node_count = var.initial_node_count
-
   // We suggest removing the default node pool, as it cannot be modified without
   // destroying the cluster.
   remove_default_node_pool = true
+  // If removing the default node pool, initial_node_count should be at least 1.
+  initial_node_count = (var.initial_node_count == 0) ? 1 : var.initial_node_count
 
   node_pools          = var.node_pools
   node_pools_labels   = var.node_pools_labels

diff --git a/modules/safer-cluster/main.tf b/modules/safer-cluster/main.tf
@@ -73,11 +73,11 @@ module "gke" {
 
   maintenance_start_time = var.maintenance_start_time
 
-  initial_node_count = var.initial_node_count
-
   // We suggest removing the default node pool, as it cannot be modified without
   // destroying the cluster.
   remove_default_node_pool = true
+  // If removing the default node pool, initial_node_count should be at least 1.
+  initial_node_count = (var.initial_node_count == 0) ? 1 : var.initial_node_count
 
   node_pools          = var.node_pools
   node_pools_labels   = var.node_pools_labels