Support ephemeral_storage_local_ssd_config

.changelog/7483.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+container: added support for `ephemeral_storage_local_ssd_config` to `google_container_cluster.node_config`, `google_container_cluster.node_pools.node_config`, `google_container_node_pool.node_config`
+```

go.sum

@@ -770,4 +770,4 @@ honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
 rsc.io/binaryregexp v0.2.0 h1:HfqmD5MEmC0zvwBuF187nq9mdnXjXsSivRiXN7SmRkE=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
-rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
+rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

google/node_config.go

@@ -166,6 +166,25 @@ func schemaNodeConfig() *schema.Schema {
 
 				"logging_variant": schemaLoggingVariant(),
 
+				"ephemeral_storage_local_ssd_config": {
+					Type:        schema.TypeList,
+					Optional:    true,
+					MaxItems:    1,
+					Description: `Parameters for the ephemeral storage filesystem. If unspecified, ephemeral storage is backed by the boot disk.`,
+					ForceNew:    true,
+					Elem: &schema.Resource{
+						Schema: map[string]*schema.Schema{
+							"local_ssd_count": {
+								Type:         schema.TypeInt,
+								Required:     true,
+								ForceNew:     true,
+								ValidateFunc: validation.IntAtLeast(0),
+								Description:  `Number of local SSDs to use to back ephemeral storage. Uses NVMe interfaces. Each local SSD must be 375 or 3000 GB in size, and all local SSDs must share the same size.`,
+							},
+						},
+					},
+				},
+
 				"local_nvme_ssd_block_config": {
 					Type:        schema.TypeList,
 					Optional:    true,
@@ -562,6 +581,13 @@ func expandNodeConfig(v interface{}) *container.NodeConfig {
 		}
 	}
 
+	if v, ok := nodeConfig["ephemeral_storage_local_ssd_config"]; ok && len(v.([]interface{})) > 0 {
+		conf := v.([]interface{})[0].(map[string]interface{})
+		nc.EphemeralStorageLocalSsdConfig = &container.EphemeralStorageLocalSsdConfig{
+			LocalSsdCount: int64(conf["local_ssd_count"].(int)),
+		}
+	}
+
 	if v, ok := nodeConfig["gcfs_config"]; ok && len(v.([]interface{})) > 0 {
 		conf := v.([]interface{})[0].(map[string]interface{})
 		nc.GcfsConfig = &container.GcfsConfig{
@@ -796,33 +822,34 @@ func flattenNodeConfig(c *container.NodeConfig) []map[string]interface{} {
 	}
 
 	config = append(config, map[string]interface{}{
-		"machine_type":                c.MachineType,
-		"disk_size_gb":                c.DiskSizeGb,
-		"disk_type":                   c.DiskType,
-		"guest_accelerator":           flattenContainerGuestAccelerators(c.Accelerators),
-		"local_ssd_count":             c.LocalSsdCount,
-		"logging_variant":             flattenLoggingVariant(c.LoggingConfig),
-		"local_nvme_ssd_block_config": flattenLocalNvmeSsdBlockConfig(c.LocalNvmeSsdBlockConfig),
-		"gcfs_config":                 flattenGcfsConfig(c.GcfsConfig),
-		"gvnic":                       flattenGvnic(c.Gvnic),
-		"reservation_affinity":        flattenGKEReservationAffinity(c.ReservationAffinity),
-		"service_account":             c.ServiceAccount,
-		"metadata":                    c.Metadata,
-		"image_type":                  c.ImageType,
-		"labels":                      c.Labels,
-		"resource_labels":             c.ResourceLabels,
-		"tags":                        c.Tags,
-		"preemptible":                 c.Preemptible,
-		"spot":                        c.Spot,
-		"min_cpu_platform":            c.MinCpuPlatform,
-		"shielded_instance_config":    flattenShieldedInstanceConfig(c.ShieldedInstanceConfig),
-		"taint":                       flattenTaints(c.Taints),
-		"workload_metadata_config":    flattenWorkloadMetadataConfig(c.WorkloadMetadataConfig),
-		"boot_disk_kms_key":           c.BootDiskKmsKey,
-		"kubelet_config":              flattenKubeletConfig(c.KubeletConfig),
-		"linux_node_config":           flattenLinuxNodeConfig(c.LinuxNodeConfig),
-		"node_group":                  c.NodeGroup,
-		"advanced_machine_features":   flattenAdvancedMachineFeaturesConfig(c.AdvancedMachineFeatures),
+		"machine_type":                       c.MachineType,
+		"disk_size_gb":                       c.DiskSizeGb,
+		"disk_type":                          c.DiskType,
+		"guest_accelerator":                  flattenContainerGuestAccelerators(c.Accelerators),
+		"local_ssd_count":                    c.LocalSsdCount,
+		"logging_variant":                    flattenLoggingVariant(c.LoggingConfig),
+		"local_nvme_ssd_block_config":        flattenLocalNvmeSsdBlockConfig(c.LocalNvmeSsdBlockConfig),
+		"ephemeral_storage_local_ssd_config": flattenEphemeralStorageLocalSsdConfig(c.EphemeralStorageLocalSsdConfig),
+		"gcfs_config":                        flattenGcfsConfig(c.GcfsConfig),
+		"gvnic":                              flattenGvnic(c.Gvnic),
+		"reservation_affinity":               flattenGKEReservationAffinity(c.ReservationAffinity),
+		"service_account":                    c.ServiceAccount,
+		"metadata":                           c.Metadata,
+		"image_type":                         c.ImageType,
+		"labels":                             c.Labels,
+		"resource_labels":                    c.ResourceLabels,
+		"tags":                               c.Tags,
+		"preemptible":                        c.Preemptible,
+		"spot":                               c.Spot,
+		"min_cpu_platform":                   c.MinCpuPlatform,
+		"shielded_instance_config":           flattenShieldedInstanceConfig(c.ShieldedInstanceConfig),
+		"taint":                              flattenTaints(c.Taints),
+		"workload_metadata_config":           flattenWorkloadMetadataConfig(c.WorkloadMetadataConfig),
+		"boot_disk_kms_key":                  c.BootDiskKmsKey,
+		"kubelet_config":                     flattenKubeletConfig(c.KubeletConfig),
+		"linux_node_config":                  flattenLinuxNodeConfig(c.LinuxNodeConfig),
+		"node_group":                         c.NodeGroup,
+		"advanced_machine_features":          flattenAdvancedMachineFeaturesConfig(c.AdvancedMachineFeatures),
 	})
 
 	if len(c.OauthScopes) > 0 {
@@ -884,6 +911,16 @@ func flattenLocalNvmeSsdBlockConfig(c *container.LocalNvmeSsdBlockConfig) []map[
 	return result
 }
 
+func flattenEphemeralStorageLocalSsdConfig(c *container.EphemeralStorageLocalSsdConfig) []map[string]interface{} {
+	result := []map[string]interface{}{}
+	if c != nil {
+		result = append(result, map[string]interface{}{
+			"local_ssd_count": c.LocalSsdCount,
+		})
+	}
+	return result
+}
+
 func flattenLoggingVariant(c *container.NodePoolLoggingConfig) string {
 	variant := "DEFAULT"
 	if c != nil && c.VariantConfig != nil && c.VariantConfig.Variant != "" {

google/resource_container_node_pool_test.go

@@ -1110,6 +1110,60 @@ func TestAccContainerNodePool_concurrent(t *testing.T) {
 	})
 }
 
+func TestAccContainerNodePool_ephemeralStorageLocalSsdConfig(t *testing.T) {
+	t.Parallel()
+
+	cluster := fmt.Sprintf("tf-test-cluster-%s", RandString(t, 10))
+	np := fmt.Sprintf("tf-test-nodepool-%s", RandString(t, 10))
+
+	VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { testAccPreCheck(t) },
+		ProtoV5ProviderFactories: ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckContainerNodePoolDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccContainerNodePool_ephemeralStorageLocalSsdConfig(cluster, np),
+			},
+			{
+				ResourceName:      "google_container_node_pool.np",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
+func testAccContainerNodePool_ephemeralStorageLocalSsdConfig(cluster, np string) string {
+	return fmt.Sprintf(`
+data "google_container_engine_versions" "central1a" {
+	location       = "us-central1-a"
+	// this feature became available in 1.25.3-gke.1800, not sure if theres a better way to do
+	version_prefix = "1.25"
+}
+
+resource "google_container_cluster" "cluster" {
+  name               = "%s"
+  location           = "us-central1-a"
+  min_master_version = data.google_container_engine_versions.central1a.latest_master_version
+  initial_node_count = 1
+}
+
+resource "google_container_node_pool" "np" {
+  name               = "%s"
+  location           = "us-central1-a"
+  cluster            = google_container_cluster.cluster.name
+  initial_node_count = 1
+
+  node_config {
+    machine_type = "n1-standard-1"
+    ephemeral_storage_local_ssd_config {
+      local_ssd_count = 1
+    }
+  }
+}
+`, cluster, np)
+}
+
 func TestAccContainerNodePool_localNvmeSsdBlockConfig(t *testing.T) {
 	t.Parallel()
 

website/docs/r/container_cluster.html.markdown

@@ -745,6 +745,13 @@ ephemeral_storage_config {
   local_ssd_count = 2
 }
 ```
+* `ephemeral_storage_local_ssd_config` - (Optional) Parameters for the ephemeral storage filesystem. If unspecified, ephemeral storage is backed by the boot disk. Structure is [documented below](#nested_ephemeral_storage_local_ssd_config).
+
+```hcl
+ephemeral_storage_local_ssd_config {
+  local_ssd_count = 2
+}
+```
 
 * `local_nvme_ssd_block_config` - (Optional) Parameters for the local NVMe SSDs. Structure is [documented below](#nested_local_nvme_ssd_block_config).
 
@@ -891,6 +898,10 @@ linux_node_config {
 
 * `local_ssd_count` (Required) - Number of local SSDs to use to back ephemeral storage. Uses NVMe interfaces. Each local SSD is 375 GB in size. If zero, it means to disable using local SSDs as ephemeral storage.
 
+<a name="nested_ephemeral_storage_local_ssd_config"></a>The `ephemeral_storage_local_ssd_config` block supports:
+
+* `local_ssd_count` (Required) - Number of local SSDs to use to back ephemeral storage. Uses NVMe interfaces. Each local SSD is 375 GB in size. If zero, it means to disable using local SSDs as ephemeral storage.
+
 <a name="nested_local_nvme_ssd_block_config"></a>The `local_nvme_ssd_block_config` block supports:
 
 * `local_ssd_count` (Required) - Number of raw-block local NVMe SSD disks to be attached to the node. Each local SSD is 375 GB in size. If zero, it means no raw-block local NVMe SSD disks to be attached to the node.