fix: ignore ASM labels (terraform-google-modules#1061)

morgante · web-flow · commit 3dea235faaf6 · 2021-11-15T16:37:23.000-05:00
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -246,7 +246,7 @@ resource "google_container_cluster" "primary" {
   }
 
   lifecycle {
-    ignore_changes = [node_pool, initial_node_count]
+    ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"], resource_labels["mesh_id"]]
   }
 
   timeouts {
diff --git a/cluster.tf b/cluster.tf
@@ -124,7 +124,7 @@ resource "google_container_cluster" "primary" {
   }
 
   lifecycle {
-    ignore_changes = [node_pool, initial_node_count]
+    ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"], resource_labels["mesh_id"]]
   }
 
   timeouts {
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -217,7 +217,7 @@ resource "google_container_cluster" "primary" {
   }
 
   lifecycle {
-    ignore_changes = [node_pool, initial_node_count]
+    ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"], resource_labels["mesh_id"]]
   }
 
   timeouts {
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -217,7 +217,7 @@ resource "google_container_cluster" "primary" {
   }
 
   lifecycle {
-    ignore_changes = [node_pool, initial_node_count]
+    ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"], resource_labels["mesh_id"]]
   }
 
   timeouts {
diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -217,7 +217,7 @@ resource "google_container_cluster" "primary" {
   }
 
   lifecycle {
-    ignore_changes = [node_pool, initial_node_count]
+    ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"], resource_labels["mesh_id"]]
   }
 
   timeouts {
diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -217,7 +217,7 @@ resource "google_container_cluster" "primary" {
   }
 
   lifecycle {
-    ignore_changes = [node_pool, initial_node_count]
+    ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"], resource_labels["mesh_id"]]
   }
 
   timeouts {
diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -124,7 +124,7 @@ resource "google_container_cluster" "primary" {
   }
 
   lifecycle {
-    ignore_changes = [node_pool, initial_node_count]
+    ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"], resource_labels["mesh_id"]]
   }
 
   timeouts {
diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -124,7 +124,7 @@ resource "google_container_cluster" "primary" {
   }
 
   lifecycle {
-    ignore_changes = [node_pool, initial_node_count]
+    ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"], resource_labels["mesh_id"]]
   }
 
   timeouts {

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ resource "google_container_cluster" "primary" {`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`lifecycle {`
`249`		`- ignore_changes = [node_pool, initial_node_count]`
	`249`	`+ ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"], resource_labels["mesh_id"]]`
`250`	`250`	`}`
`251`	`251`
`252`	`252`	`timeouts {`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ resource "google_container_cluster" "primary" {`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`lifecycle {`
`127`		`- ignore_changes = [node_pool, initial_node_count]`
	`127`	`+ ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"], resource_labels["mesh_id"]]`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`timeouts {`
Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ resource "google_container_cluster" "primary" {`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`lifecycle {`
`220`		`- ignore_changes = [node_pool, initial_node_count]`
	`220`	`+ ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"], resource_labels["mesh_id"]]`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`timeouts {`