Mark node_config.metadata Computed, set default value explicitly in e…

…xamples, add warning to docs
GoogleCloudPlatform · Mar 13, 2019 · 9794478 · 9794478
1 parent 6283943
commit 9794478
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/third_party/terraform/utils/node_config.go.erb b/third_party/terraform/utils/node_config.go.erb
@@ -97,6 +97,7 @@ var schemaNodeConfig = &schema.Schema{
 			"metadata": {
 				Type:     schema.TypeMap,
 				Optional: true,
+				Computed: true,
 				ForceNew: true,
 				Elem:     &schema.Schema{Type: schema.TypeString},
 			},

diff --git a/third_party/terraform/website/docs/r/container_cluster.html.markdown b/third_party/terraform/website/docs/r/container_cluster.html.markdown
@@ -61,6 +61,10 @@ resource "google_container_node_pool" "primary_preemptible_nodes" {
     preemptible  = true
     machine_type = "n1-standard-1"
 
+    metadata {
+      disable-legacy-endpoints = "true"
+    }
+
     oauth_scopes = [
       "https://www.googleapis.com/auth/compute",
       "https://www.googleapis.com/auth/devstorage.read_only",
@@ -107,6 +111,10 @@ resource "google_container_cluster" "primary" {
       "https://www.googleapis.com/auth/monitoring",
     ]
 
+    metadata {
+      disable-legacy-endpoints = "true"
+    }
+
     labels = {
       foo = "bar"
     }
@@ -456,7 +464,10 @@ The `node_config` block supports:
     [here](https://cloud.google.com/compute/docs/reference/latest/instances#machineType).
 
 * `metadata` - (Optional) The metadata key/value pairs assigned to instances in
-    the cluster.
+    the cluster. From GKE `1.12` onwards, `disable-legacy-endpoints` is set to
+    `true` by the API; if `metadata` is set but that default value is not
+    included, Terraform will attempt to unset the value. To avoid this, set the
+    value in your config.
 
 * `min_cpu_platform` - (Optional) Minimum CPU platform to be used by this instance.
     The instance may be scheduled on the specified or newer CPU platform. Applicable

diff --git a/third_party/terraform/website/docs/r/container_node_pool.html.markdown b/third_party/terraform/website/docs/r/container_node_pool.html.markdown
@@ -84,6 +84,10 @@ resource "google_container_cluster" "primary" {
       "https://www.googleapis.com/auth/monitoring",
     ]
 
+    metadata {
+      disable-legacy-endpoints = "true"
+    }
+
     guest_accelerator {
       type  = "nvidia-tesla-k80"
       count = 1