fix: adds metadata to the default node pool (#1018)

* fix:adds metadata to the default node pool * This removes the default_node_pool metadata map Co-authored-by: Awais Malik <awmalik@google.com>
terraform-google-modules · Oct 11, 2021 · 660ddc9 · 660ddc9
1 parent be610cb
commit 660ddc9
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 0 deletions.
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -261,6 +261,8 @@ resource "google_container_cluster" "primary" {
           node_metadata = workload_metadata_config.value.node_metadata
         }
       }
+
+      metadata = local.node_pools_metadata["all"]
     }
   }
 

diff --git a/cluster.tf b/cluster.tf
@@ -147,6 +147,8 @@ resource "google_container_cluster" "primary" {
           node_metadata = workload_metadata_config.value.node_metadata
         }
       }
+
+      metadata = local.node_pools_metadata["all"]
     }
   }
 

diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -234,6 +234,8 @@ resource "google_container_cluster" "primary" {
           node_metadata = workload_metadata_config.value.node_metadata
         }
       }
+
+      metadata = local.node_pools_metadata["all"]
     }
   }
 

diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -234,6 +234,8 @@ resource "google_container_cluster" "primary" {
           node_metadata = workload_metadata_config.value.node_metadata
         }
       }
+
+      metadata = local.node_pools_metadata["all"]
     }
   }
 

diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -234,6 +234,8 @@ resource "google_container_cluster" "primary" {
           node_metadata = workload_metadata_config.value.node_metadata
         }
       }
+
+      metadata = local.node_pools_metadata["all"]
     }
   }
 

diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -234,6 +234,8 @@ resource "google_container_cluster" "primary" {
           node_metadata = workload_metadata_config.value.node_metadata
         }
       }
+
+      metadata = local.node_pools_metadata["all"]
     }
   }
 

diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -147,6 +147,8 @@ resource "google_container_cluster" "primary" {
           node_metadata = workload_metadata_config.value.node_metadata
         }
       }
+
+      metadata = local.node_pools_metadata["all"]
     }
   }
 

diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -147,6 +147,8 @@ resource "google_container_cluster" "primary" {
           node_metadata = workload_metadata_config.value.node_metadata
         }
       }
+
+      metadata = local.node_pools_metadata["all"]
     }
   }