fix: Do not ignore "mesh_id" label on "google_container_cluster" resource (#1836)

legal90 · web-flow · commit 95641a6e7b1e · 2024-01-18T11:37:29.000-08:00
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -399,7 +399,7 @@ resource "google_container_cluster" "primary" {
 
   {% if autopilot_cluster != true %}
   lifecycle {
-    ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"], resource_labels["mesh_id"]]
+    ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"]]
   }
   {% endif %}
 
diff --git a/cluster.tf b/cluster.tf
@@ -270,7 +270,7 @@ resource "google_container_cluster" "primary" {
   }
 
   lifecycle {
-    ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"], resource_labels["mesh_id"]]
+    ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"]]
   }
 
   dynamic "dns_config" {
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -328,7 +328,7 @@ resource "google_container_cluster" "primary" {
   }
 
   lifecycle {
-    ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"], resource_labels["mesh_id"]]
+    ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"]]
   }
 
   dynamic "dns_config" {
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -328,7 +328,7 @@ resource "google_container_cluster" "primary" {
   }
 
   lifecycle {
-    ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"], resource_labels["mesh_id"]]
+    ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"]]
   }
 
   dynamic "dns_config" {
diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -328,7 +328,7 @@ resource "google_container_cluster" "primary" {
   }
 
   lifecycle {
-    ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"], resource_labels["mesh_id"]]
+    ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"]]
   }
 
   dynamic "dns_config" {
diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -328,7 +328,7 @@ resource "google_container_cluster" "primary" {
   }
 
   lifecycle {
-    ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"], resource_labels["mesh_id"]]
+    ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"]]
   }
 
   dynamic "dns_config" {
diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -270,7 +270,7 @@ resource "google_container_cluster" "primary" {
   }
 
   lifecycle {
-    ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"], resource_labels["mesh_id"]]
+    ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"]]
   }
 
   dynamic "dns_config" {
diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -270,7 +270,7 @@ resource "google_container_cluster" "primary" {
   }
 
   lifecycle {
-    ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"], resource_labels["mesh_id"]]
+    ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"]]
   }
 
   dynamic "dns_config" {

Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,7 @@ resource "google_container_cluster" "primary" {`
`399`	`399`
`400`	`400`	`{% if autopilot_cluster != true %}`
`401`	`401`	`lifecycle {`
`402`		`- ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"], resource_labels["mesh_id"]]`
	`402`	`+ ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"]]`
`403`	`403`	`}`
`404`	`404`	`{% endif %}`
`405`	`405`
Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ resource "google_container_cluster" "primary" {`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`lifecycle {`
`273`		`- ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"], resource_labels["mesh_id"]]`
	`273`	`+ ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"]]`
`274`	`274`	`}`
`275`	`275`
`276`	`276`	`dynamic "dns_config" {`
Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,7 @@ resource "google_container_cluster" "primary" {`
`328`	`328`	`}`
`329`	`329`
`330`	`330`	`lifecycle {`
`331`		`- ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"], resource_labels["mesh_id"]]`
	`331`	`+ ignore_changes = [node_pool, initial_node_count, resource_labels["asmv"]]`
`332`	`332`	`}`
`333`	`333`
`334`	`334`	`dynamic "dns_config" {`