add support for CPU Platform in google_container_node_pool

Author: davidquarles

google/node_config.go

@@ -91,6 +91,12 @@ var schemaNodeConfig = &schema.Schema{
 				ForceNew: true,
 				Default:  false,
 			},
+
+			"min_cpu_platform": {
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
 		},
 	},
 }
@@ -158,6 +164,10 @@ func expandNodeConfig(v interface{}) *container.NodeConfig {
 	// Preemptible Is Optional+Default, so it always has a value
 	nc.Preemptible = nodeConfig["preemptible"].(bool)
 
+	if v, ok := nodeConfig["min_cpu_platform"]; ok {
+		nc.MinCpuPlatform = v.(string)
+	}
+
 	return nc
 }
 
@@ -169,15 +179,16 @@ func flattenNodeConfig(c *container.NodeConfig) []map[string]interface{} {
 	}
 
 	config = append(config, map[string]interface{}{
-		"machine_type":    c.MachineType,
-		"disk_size_gb":    c.DiskSizeGb,
-		"local_ssd_count": c.LocalSsdCount,
-		"service_account": c.ServiceAccount,
-		"metadata":        c.Metadata,
-		"image_type":      c.ImageType,
-		"labels":          c.Labels,
-		"tags":            c.Tags,
-		"preemptible":     c.Preemptible,
+		"machine_type":     c.MachineType,
+		"disk_size_gb":     c.DiskSizeGb,
+		"local_ssd_count":  c.LocalSsdCount,
+		"service_account":  c.ServiceAccount,
+		"metadata":         c.Metadata,
+		"image_type":       c.ImageType,
+		"labels":           c.Labels,
+		"tags":             c.Tags,
+		"preemptible":      c.Preemptible,
+		"min_cpu_platform": c.MinCpuPlatform,
 	})
 
 	if len(c.OauthScopes) > 0 {

google/resource_container_cluster_test.go

@@ -591,6 +591,7 @@ func testAccCheckContainerCluster(n string) resource.TestCheckFunc {
 			{"node_config.0.labels", cluster.NodeConfig.Labels},
 			{"node_config.0.tags", cluster.NodeConfig.Tags},
 			{"node_config.0.preemptible", cluster.NodeConfig.Preemptible},
+			{"node_config.0.min_cpu_platform", cluster.NodeConfig.MinCpuPlatform},
 			{"node_version", cluster.CurrentNodeVersion},
 		}
 
@@ -1006,6 +1007,7 @@ resource "google_container_cluster" "with_node_config" {
 		}
 		tags = ["foo", "bar"]
 		preemptible = true
+		min_cpu_platform = "Intel Broadwell"
 	}
 }`, acctest.RandString(10))
 

google/resource_container_node_pool_test.go

@@ -238,6 +238,7 @@ func testAccCheckContainerNodePoolMatches(n string) resource.TestCheckFunc {
 			{"node_config.0.labels", nodepool.Config.Labels},
 			{"node_config.0.tags", nodepool.Config.Tags},
 			{"node_config.0.preemptible", nodepool.Config.Preemptible},
+			{"node_config.0.min_cpu_platform", nodepool.Config.MinCpuPlatform},
 		}
 
 		for _, attrs := range nodepoolTests {
@@ -517,6 +518,7 @@ resource "google_container_node_pool" "np_with_node_config" {
 			"https://www.googleapis.com/auth/monitoring"
 		]
 		preemptible = true
+		min_cpu_platform = "Intel Broadwell"
 	}
 }`, acctest.RandString(10), acctest.RandString(10))
 

website/docs/r/container_cluster.html.markdown

@@ -159,6 +159,12 @@ which the cluster's instances are launched
     are preemptible. See the [official documentation](https://cloud.google.com/container-engine/docs/preemptible-vm)
     for more information. Defaults to false.
 
+* `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
+    values are the friendly names of CPU platforms, such as `Intel Haswell`. See the
+    [official documentation](https://cloud.google.com/compute/docs/instances/specify-m  in-cpu-platform)
+    for more information.
+
 **Addons Config** supports the following addons:
 
 * `http_load_balancing` - (Optional) The status of the HTTP Load Balancing

website/docs/r/container_node_pool.html.markdown

@@ -114,6 +114,12 @@ resource "google_container_cluster" "primary" {
     are preemptible. See the [official documentation](https://cloud.google.com/container-engine/docs/preemptible-vm)
     for more information. Defaults to false.
 
+* `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
+    values are the friendly names of CPU platforms, such as `Intel Haswell`. See the
+    [official documentation](https://cloud.google.com/compute/docs/instances/specify-m    in-cpu-platform)
+    for more information.
+
 The `autoscaling` block supports:
 
 * `min_node_count` - (Required) Minimum number of nodes in the NodePool. Must be >=1 and