From 660ddc9afc9ed8a308d9388a08eff3c36af551a0 Mon Sep 17 00:00:00 2001
From: Awais Malik <malik.awais@gmail.com>
Date: Mon, 11 Oct 2021 10:00:36 -0700
Subject: [PATCH] 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>
---
 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, 16 insertions(+)

diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
index 40b7ae119..90d42f83f 100644
--- 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
index 9a8ab4413..3b829768f 100644
--- 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
index 15f3cd244..a466a6f94 100644
--- 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
index f3bead1ee..9198d65b5 100644
--- 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
index 5bda5198d..8fb85af29 100644
--- 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
index 60dd3b09e..a1072525a 100644
--- 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
index 8945b5028..ce1342b05 100644
--- 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
index 85181fd09..1ec65d0ce 100644
--- 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"]
     }
   }