From 10be6f3c523653bf69c81c8f9b59cd8e4554185f Mon Sep 17 00:00:00 2001
From: "Julian V. Modesto" <julian.modesto@liveramp.com>
Date: Wed, 4 Sep 2019 10:45:38 -0400
Subject: [PATCH] Ignore changes to initial node count

---
 autogen/cluster.tf                      | 3 +--
 cluster.tf                              | 3 +--
 modules/beta-private-cluster/cluster.tf | 3 +--
 modules/beta-public-cluster/cluster.tf  | 3 +--
 modules/private-cluster/cluster.tf      | 3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/autogen/cluster.tf b/autogen/cluster.tf
index 17f6653ad9..4e5fd74d55 100644
--- a/autogen/cluster.tf
+++ b/autogen/cluster.tf
@@ -143,7 +143,7 @@ resource "google_container_cluster" "primary" {
   }
 
   lifecycle {
-    ignore_changes = [node_pool]
+    ignore_changes = [node_pool, initial_node_count]
   }
 
   timeouts {
@@ -152,7 +152,6 @@ resource "google_container_cluster" "primary" {
     delete = "30m"
   }
 
-  initial_node_count = var.initial_node_count
   node_pool {
     name               = "default-pool"
     initial_node_count = var.initial_node_count
diff --git a/cluster.tf b/cluster.tf
index 62766e122a..ffdb27b0fc 100644
--- a/cluster.tf
+++ b/cluster.tf
@@ -99,7 +99,7 @@ resource "google_container_cluster" "primary" {
   }
 
   lifecycle {
-    ignore_changes = [node_pool]
+    ignore_changes = [node_pool, initial_node_count]
   }
 
   timeouts {
@@ -108,7 +108,6 @@ resource "google_container_cluster" "primary" {
     delete = "30m"
   }
 
-  initial_node_count = var.initial_node_count
   node_pool {
     name               = "default-pool"
     initial_node_count = var.initial_node_count
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
index 6fce4d8598..c481c69a35 100644
--- a/modules/beta-private-cluster/cluster.tf
+++ b/modules/beta-private-cluster/cluster.tf
@@ -135,7 +135,7 @@ resource "google_container_cluster" "primary" {
   }
 
   lifecycle {
-    ignore_changes = [node_pool]
+    ignore_changes = [node_pool, initial_node_count]
   }
 
   timeouts {
@@ -144,7 +144,6 @@ resource "google_container_cluster" "primary" {
     delete = "30m"
   }
 
-  initial_node_count = var.initial_node_count
   node_pool {
     name               = "default-pool"
     initial_node_count = var.initial_node_count
diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
index c36f99c596..a264e932b9 100644
--- a/modules/beta-public-cluster/cluster.tf
+++ b/modules/beta-public-cluster/cluster.tf
@@ -135,7 +135,7 @@ resource "google_container_cluster" "primary" {
   }
 
   lifecycle {
-    ignore_changes = [node_pool]
+    ignore_changes = [node_pool, initial_node_count]
   }
 
   timeouts {
@@ -144,7 +144,6 @@ resource "google_container_cluster" "primary" {
     delete = "30m"
   }
 
-  initial_node_count = var.initial_node_count
   node_pool {
     name               = "default-pool"
     initial_node_count = var.initial_node_count
diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
index 5954739abd..412e8295ed 100644
--- a/modules/private-cluster/cluster.tf
+++ b/modules/private-cluster/cluster.tf
@@ -99,7 +99,7 @@ resource "google_container_cluster" "primary" {
   }
 
   lifecycle {
-    ignore_changes = [node_pool]
+    ignore_changes = [node_pool, initial_node_count]
   }
 
   timeouts {
@@ -108,7 +108,6 @@ resource "google_container_cluster" "primary" {
     delete = "30m"
   }
 
-  initial_node_count = var.initial_node_count
   node_pool {
     name               = "default-pool"
     initial_node_count = var.initial_node_count