Merge pull request #400 from Dev25/node-metadata-v1

morgante · web-flow · commit 5188b84bd945 · 2020-01-15T15:16:14.000-08:00
Allow overriding node_metadata in node pools
diff --git a/autogen/main/README.md b/autogen/main/README.md
@@ -172,7 +172,7 @@ The node_pools variable takes the following parameters:
 | node_count | The number of nodes in the nodepool when autoscaling is false. Otherwise defaults to 1. Only valid for non-autoscaling clusers |  | Required |
 {% if beta_cluster %}
 | node_locations | The list of zones in which the cluster's nodes are located. Nodes must be in the region of their regional cluster or in the same region as their cluster's zone for zonal clusters. Defaults to cluster level node locations if nothing is specified | " " | Optional |
-| node_metadata | Options to expose the node metadata to the workload running on the node | | Required |
+| node_metadata | Options to expose the node metadata to the workload running on the node | | Optional |
 {% endif %}
 | preemptible | A boolean that represents whether or not the underlying node VMs are preemptible | false | Optional |
 {% if beta_cluster %}
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -451,7 +451,7 @@ resource "google_container_node_pool" "pools" {
       for_each = local.cluster_node_metadata_config
 
       content {
-        node_metadata = workload_metadata_config.value.node_metadata
+        node_metadata = lookup(var.node_pools[count.index], "node_metadata", workload_metadata_config.value.node_metadata)
       }
     }
 
diff --git a/modules/beta-private-cluster-update-variant/README.md b/modules/beta-private-cluster-update-variant/README.md
@@ -259,7 +259,7 @@ The node_pools variable takes the following parameters:
 | name | The name of the node pool |  | Required |
 | node_count | The number of nodes in the nodepool when autoscaling is false. Otherwise defaults to 1. Only valid for non-autoscaling clusers |  | Required |
 | node_locations | The list of zones in which the cluster's nodes are located. Nodes must be in the region of their regional cluster or in the same region as their cluster's zone for zonal clusters. Defaults to cluster level node locations if nothing is specified | " " | Optional |
-| node_metadata | Options to expose the node metadata to the workload running on the node | | Required |
+| node_metadata | Options to expose the node metadata to the workload running on the node | | Optional |
 | preemptible | A boolean that represents whether or not the underlying node VMs are preemptible | false | Optional |
 | sandbox_type | Sandbox to use for pods in the node pool | | Required |
 | service_account | The service account to be used by the Node VMs | " " | Optional |
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -412,7 +412,7 @@ resource "google_container_node_pool" "pools" {
       for_each = local.cluster_node_metadata_config
 
       content {
-        node_metadata = workload_metadata_config.value.node_metadata
+        node_metadata = lookup(var.node_pools[count.index], "node_metadata", workload_metadata_config.value.node_metadata)
       }
     }
 
diff --git a/modules/beta-private-cluster/README.md b/modules/beta-private-cluster/README.md
@@ -259,7 +259,7 @@ The node_pools variable takes the following parameters:
 | name | The name of the node pool |  | Required |
 | node_count | The number of nodes in the nodepool when autoscaling is false. Otherwise defaults to 1. Only valid for non-autoscaling clusers |  | Required |
 | node_locations | The list of zones in which the cluster's nodes are located. Nodes must be in the region of their regional cluster or in the same region as their cluster's zone for zonal clusters. Defaults to cluster level node locations if nothing is specified | " " | Optional |
-| node_metadata | Options to expose the node metadata to the workload running on the node | | Required |
+| node_metadata | Options to expose the node metadata to the workload running on the node | | Optional |
 | preemptible | A boolean that represents whether or not the underlying node VMs are preemptible | false | Optional |
 | sandbox_type | Sandbox to use for pods in the node pool | | Required |
 | service_account | The service account to be used by the Node VMs | " " | Optional |
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -340,7 +340,7 @@ resource "google_container_node_pool" "pools" {
       for_each = local.cluster_node_metadata_config
 
       content {
-        node_metadata = workload_metadata_config.value.node_metadata
+        node_metadata = lookup(var.node_pools[count.index], "node_metadata", workload_metadata_config.value.node_metadata)
       }
     }
 
diff --git a/modules/beta-public-cluster/README.md b/modules/beta-public-cluster/README.md
@@ -237,7 +237,7 @@ The node_pools variable takes the following parameters:
 | name | The name of the node pool |  | Required |
 | node_count | The number of nodes in the nodepool when autoscaling is false. Otherwise defaults to 1. Only valid for non-autoscaling clusers |  | Required |
 | node_locations | The list of zones in which the cluster's nodes are located. Nodes must be in the region of their regional cluster or in the same region as their cluster's zone for zonal clusters. Defaults to cluster level node locations if nothing is specified | " " | Optional |
-| node_metadata | Options to expose the node metadata to the workload running on the node | | Required |
+| node_metadata | Options to expose the node metadata to the workload running on the node | | Optional |
 | preemptible | A boolean that represents whether or not the underlying node VMs are preemptible | false | Optional |
 | sandbox_type | Sandbox to use for pods in the node pool | | Required |
 | service_account | The service account to be used by the Node VMs | " " | Optional |
diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -327,7 +327,7 @@ resource "google_container_node_pool" "pools" {
       for_each = local.cluster_node_metadata_config
 
       content {
-        node_metadata = workload_metadata_config.value.node_metadata
+        node_metadata = lookup(var.node_pools[count.index], "node_metadata", workload_metadata_config.value.node_metadata)
       }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -451,7 +451,7 @@ resource "google_container_node_pool" "pools" {`
`451`	`451`	`for_each = local.cluster_node_metadata_config`
`452`	`452`
`453`	`453`	`content {`
`454`		`- node_metadata = workload_metadata_config.value.node_metadata`
	`454`	`+ node_metadata = lookup(var.node_pools[count.index], "node_metadata", workload_metadata_config.value.node_metadata)`
`455`	`455`	`}`
`456`	`456`	`}`
`457`	`457`
Original file line number	Diff line number	Diff line change
`@@ -412,7 +412,7 @@ resource "google_container_node_pool" "pools" {`
`412`	`412`	`for_each = local.cluster_node_metadata_config`
`413`	`413`
`414`	`414`	`content {`
`415`		`- node_metadata = workload_metadata_config.value.node_metadata`
	`415`	`+ node_metadata = lookup(var.node_pools[count.index], "node_metadata", workload_metadata_config.value.node_metadata)`
`416`	`416`	`}`
`417`	`417`	`}`
`418`	`418`
Original file line number	Diff line number	Diff line change
`@@ -340,7 +340,7 @@ resource "google_container_node_pool" "pools" {`
`340`	`340`	`for_each = local.cluster_node_metadata_config`
`341`	`341`
`342`	`342`	`content {`
`343`		`- node_metadata = workload_metadata_config.value.node_metadata`
	`343`	`+ node_metadata = lookup(var.node_pools[count.index], "node_metadata", workload_metadata_config.value.node_metadata)`
`344`	`344`	`}`
`345`	`345`	`}`
`346`	`346`
Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ resource "google_container_node_pool" "pools" {`
`327`	`327`	`for_each = local.cluster_node_metadata_config`
`328`	`328`
`329`	`329`	`content {`
`330`		`- node_metadata = workload_metadata_config.value.node_metadata`
	`330`	`+ node_metadata = lookup(var.node_pools[count.index], "node_metadata", workload_metadata_config.value.node_metadata)`
`331`	`331`	`}`
`332`	`332`	`}`
`333`	`333`