feat: Add local_ssd_ephemeral_count to default configuration (terraform-google-modules#1944)

Author: alvicsam

README.md

@@ -300,6 +300,7 @@ The node_pools variable takes the following parameters:
 | key | The key required for the taint | | Required |
 | logging_variant | The type of logging agent that is deployed by default for newly created node pools in the cluster. Valid values include DEFAULT and MAX_THROUGHPUT. | DEFAULT | Optional |
 | local_ssd_count | The amount of local SSD disks that will be attached to each cluster node and may be used as a `hostpath` volume or a `local` PersistentVolume. | 0 | Optional |
+| local_ssd_ephemeral_storage_count | The amount of local SSD disks that will be attached to each cluster node and assigned as scratch space as an `emptyDir` volume. If unspecified, ephemeral storage is backed by the cluster node boot disk. | 0 | Optional |
 | local_nvme_ssd_count | 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. | 0 | Optional |
 | machine_type | The name of a Google Compute Engine machine type | e2-medium | Optional |
 | min_cpu_platform | Minimum CPU platform to be used by the nodes in the pool. The nodes may be scheduled on the specified or newer CPU platform. | " " | Optional |

autogen/main/README.md

@@ -212,6 +212,7 @@ The node_pools variable takes the following parameters:
 | key | The key required for the taint | | Required |
 | logging_variant | The type of logging agent that is deployed by default for newly created node pools in the cluster. Valid values include DEFAULT and MAX_THROUGHPUT. | DEFAULT | Optional |
 | local_ssd_count | The amount of local SSD disks that will be attached to each cluster node and may be used as a `hostpath` volume or a `local` PersistentVolume. | 0 | Optional |
+| local_ssd_ephemeral_storage_count | The amount of local SSD disks that will be attached to each cluster node and assigned as scratch space as an `emptyDir` volume. If unspecified, ephemeral storage is backed by the cluster node boot disk. | 0 | Optional |
 {% if beta_cluster %}
 | local_ssd_ephemeral_count | The amount of local SSD disks that will be attached to each cluster node and assigned as scratch space as an `emptyDir` volume. If unspecified, ephemeral storage is backed by the cluster node boot disk. | 0 | Optional |
 {% endif %}

autogen/main/cluster.tf.tmpl

@@ -870,6 +870,12 @@ resource "google_container_node_pool" "windows_pools" {
  disk_size_gb = lookup(each.value, "disk_size_gb", 100)
  disk_type = lookup(each.value, "disk_type", "pd-standard")
 
+ dynamic "ephemeral_storage_local_ssd_config" {
+ for_each = lookup(each.value, "local_ssd_ephemeral_storage_count", 0) > 0 ? [each.value.local_ssd_ephemeral_count] : []
+ content {
+ local_ssd_count = ephemeral_storage_local_ssd_config.value
+ }
+ }
  {% if beta_cluster %}
  dynamic "ephemeral_storage_config" {
  for_each = lookup(each.value, "local_ssd_ephemeral_count",0) > 0 ? [each.value.local_ssd_ephemeral_count] : []

cluster.tf

@@ -595,6 +595,12 @@ resource "google_container_node_pool" "pools" {
  disk_size_gb = lookup(each.value, "disk_size_gb", 100)
  disk_type = lookup(each.value, "disk_type", "pd-standard")
 
+ dynamic "ephemeral_storage_local_ssd_config" {
+ for_each = lookup(each.value, "local_ssd_ephemeral_storage_count", 0) > 0 ? [each.value.local_ssd_ephemeral_count] : []
+ content {
+ local_ssd_count = ephemeral_storage_local_ssd_config.value
+ }
+ }
 
  dynamic "local_nvme_ssd_block_config" {
  for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [each.value.local_nvme_ssd_count] : []
@@ -820,6 +826,12 @@ resource "google_container_node_pool" "windows_pools" {
  disk_size_gb = lookup(each.value, "disk_size_gb", 100)
  disk_type = lookup(each.value, "disk_type", "pd-standard")
 
+ dynamic "ephemeral_storage_local_ssd_config" {
+ for_each = lookup(each.value, "local_ssd_ephemeral_storage_count", 0) > 0 ? [each.value.local_ssd_ephemeral_count] : []
+ content {
+ local_ssd_count = ephemeral_storage_local_ssd_config.value
+ }
+ }
 
  dynamic "local_nvme_ssd_block_config" {
  for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [each.value.local_nvme_ssd_count] : []

examples/node_pool/main.tf

@@ -66,18 +66,19 @@ module "gke" {
  service_account = var.compute_engine_service_account
  },
  {
- name = "pool-03"
- machine_type = "n1-standard-2"
- node_locations = "${var.region}-b,${var.region}-c"
- autoscaling = false
- node_count = 2
- disk_type = "pd-standard"
- auto_upgrade = true
- service_account = var.compute_engine_service_account
- pod_range = "test"
- sandbox_enabled = true
- cpu_manager_policy = "static"
- cpu_cfs_quota = true
+ name = "pool-03"
+ machine_type = "n1-standard-2"
+ node_locations = "${var.region}-b,${var.region}-c"
+ autoscaling = false
+ node_count = 2
+ disk_type = "pd-standard"
+ auto_upgrade = true
+ service_account = var.compute_engine_service_account
+ pod_range = "test"
+ sandbox_enabled = true
+ cpu_manager_policy = "static"
+ cpu_cfs_quota = true
+ local_ssd_ephemeral_count = 2
  },
  ]
 

modules/beta-private-cluster-update-variant/README.md

@@ -362,6 +362,7 @@ The node_pools variable takes the following parameters:
 | key | The key required for the taint | | Required |
 | logging_variant | The type of logging agent that is deployed by default for newly created node pools in the cluster. Valid values include DEFAULT and MAX_THROUGHPUT. | DEFAULT | Optional |
 | local_ssd_count | The amount of local SSD disks that will be attached to each cluster node and may be used as a `hostpath` volume or a `local` PersistentVolume. | 0 | Optional |
+| local_ssd_ephemeral_storage_count | The amount of local SSD disks that will be attached to each cluster node and assigned as scratch space as an `emptyDir` volume. If unspecified, ephemeral storage is backed by the cluster node boot disk. | 0 | Optional |
 | local_ssd_ephemeral_count | The amount of local SSD disks that will be attached to each cluster node and assigned as scratch space as an `emptyDir` volume. If unspecified, ephemeral storage is backed by the cluster node boot disk. | 0 | Optional |
 | local_nvme_ssd_count | 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. | 0 | Optional |
 | machine_type | The name of a Google Compute Engine machine type | e2-medium | Optional |

modules/beta-private-cluster-update-variant/cluster.tf

@@ -756,6 +756,12 @@ resource "google_container_node_pool" "pools" {
  disk_size_gb = lookup(each.value, "disk_size_gb", 100)
  disk_type = lookup(each.value, "disk_type", "pd-standard")
 
+ dynamic "ephemeral_storage_local_ssd_config" {
+ for_each = lookup(each.value, "local_ssd_ephemeral_storage_count", 0) > 0 ? [each.value.local_ssd_ephemeral_count] : []
+ content {
+ local_ssd_count = ephemeral_storage_local_ssd_config.value
+ }
+ }
  dynamic "ephemeral_storage_config" {
  for_each = lookup(each.value, "local_ssd_ephemeral_count", 0) > 0 ? [each.value.local_ssd_ephemeral_count] : []
  content {
@@ -1007,6 +1013,12 @@ resource "google_container_node_pool" "windows_pools" {
  disk_size_gb = lookup(each.value, "disk_size_gb", 100)
  disk_type = lookup(each.value, "disk_type", "pd-standard")
 
+ dynamic "ephemeral_storage_local_ssd_config" {
+ for_each = lookup(each.value, "local_ssd_ephemeral_storage_count", 0) > 0 ? [each.value.local_ssd_ephemeral_count] : []
+ content {
+ local_ssd_count = ephemeral_storage_local_ssd_config.value
+ }
+ }
  dynamic "ephemeral_storage_config" {
  for_each = lookup(each.value, "local_ssd_ephemeral_count", 0) > 0 ? [each.value.local_ssd_ephemeral_count] : []
  content {

modules/beta-private-cluster/README.md

@@ -340,6 +340,7 @@ The node_pools variable takes the following parameters:
 | key | The key required for the taint | | Required |
 | logging_variant | The type of logging agent that is deployed by default for newly created node pools in the cluster. Valid values include DEFAULT and MAX_THROUGHPUT. | DEFAULT | Optional |
 | local_ssd_count | The amount of local SSD disks that will be attached to each cluster node and may be used as a `hostpath` volume or a `local` PersistentVolume. | 0 | Optional |
+| local_ssd_ephemeral_storage_count | The amount of local SSD disks that will be attached to each cluster node and assigned as scratch space as an `emptyDir` volume. If unspecified, ephemeral storage is backed by the cluster node boot disk. | 0 | Optional |
 | local_ssd_ephemeral_count | The amount of local SSD disks that will be attached to each cluster node and assigned as scratch space as an `emptyDir` volume. If unspecified, ephemeral storage is backed by the cluster node boot disk. | 0 | Optional |
 | local_nvme_ssd_count | 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. | 0 | Optional |
 | machine_type | The name of a Google Compute Engine machine type | e2-medium | Optional |

modules/beta-private-cluster/cluster.tf

@@ -680,6 +680,12 @@ resource "google_container_node_pool" "pools" {
  disk_size_gb = lookup(each.value, "disk_size_gb", 100)
  disk_type = lookup(each.value, "disk_type", "pd-standard")
 
+ dynamic "ephemeral_storage_local_ssd_config" {
+ for_each = lookup(each.value, "local_ssd_ephemeral_storage_count", 0) > 0 ? [each.value.local_ssd_ephemeral_count] : []
+ content {
+ local_ssd_count = ephemeral_storage_local_ssd_config.value
+ }
+ }
  dynamic "ephemeral_storage_config" {
  for_each = lookup(each.value, "local_ssd_ephemeral_count", 0) > 0 ? [each.value.local_ssd_ephemeral_count] : []
  content {
@@ -930,6 +936,12 @@ resource "google_container_node_pool" "windows_pools" {
  disk_size_gb = lookup(each.value, "disk_size_gb", 100)
  disk_type = lookup(each.value, "disk_type", "pd-standard")
 
+ dynamic "ephemeral_storage_local_ssd_config" {
+ for_each = lookup(each.value, "local_ssd_ephemeral_storage_count", 0) > 0 ? [each.value.local_ssd_ephemeral_count] : []
+ content {
+ local_ssd_count = ephemeral_storage_local_ssd_config.value
+ }
+ }
  dynamic "ephemeral_storage_config" {
  for_each = lookup(each.value, "local_ssd_ephemeral_count", 0) > 0 ? [each.value.local_ssd_ephemeral_count] : []
  content {

modules/beta-public-cluster-update-variant/README.md

@@ -349,6 +349,7 @@ The node_pools variable takes the following parameters:
 | key | The key required for the taint | | Required |
 | logging_variant | The type of logging agent that is deployed by default for newly created node pools in the cluster. Valid values include DEFAULT and MAX_THROUGHPUT. | DEFAULT | Optional |
 | local_ssd_count | The amount of local SSD disks that will be attached to each cluster node and may be used as a `hostpath` volume or a `local` PersistentVolume. | 0 | Optional |
+| local_ssd_ephemeral_storage_count | The amount of local SSD disks that will be attached to each cluster node and assigned as scratch space as an `emptyDir` volume. If unspecified, ephemeral storage is backed by the cluster node boot disk. | 0 | Optional |
 | local_ssd_ephemeral_count | The amount of local SSD disks that will be attached to each cluster node and assigned as scratch space as an `emptyDir` volume. If unspecified, ephemeral storage is backed by the cluster node boot disk. | 0 | Optional |
 | local_nvme_ssd_count | 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. | 0 | Optional |
 | machine_type | The name of a Google Compute Engine machine type | e2-medium | Optional |