From 95641a6e7b1eab8d59e6da48a7e15a5e662da203 Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov Date: Thu, 18 Jan 2024 20:37:29 +0100 Subject: [PATCH] fix: Do not ignore "mesh_id" label on "google_container_cluster" resource (#1836) --- autogen/main/cluster.tf.tmpl | 2 +- cluster.tf | 2 +- modules/beta-private-cluster-update-variant/cluster.tf | 2 +- modules/beta-private-cluster/cluster.tf | 2 +- modules/beta-public-cluster-update-variant/cluster.tf | 2 +- modules/beta-public-cluster/cluster.tf | 2 +- modules/private-cluster-update-variant/cluster.tf | 2 +- modules/private-cluster/cluster.tf | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl index fea3e367a..21a2ed4d1 100644 --- 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 index 895750c4b..c3b9d7d5b 100644 --- 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 index f153d61d7..2e4d762f4 100644 --- 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 index 18dec1ba3..f2975f268 100644 --- 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 index aab67d6d1..5c28b7451 100644 --- 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 index a7224d24a..3c462677b 100644 --- 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 index 4c30546a9..65d072a85 100644 --- 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 index 802ce4fa6..a2ff5ec7e 100644 --- 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" {