diff --git a/.changelog/3827.txt b/.changelog/3827.txt new file mode 100644 index 00000000000..d939d9d549b --- /dev/null +++ b/.changelog/3827.txt @@ -0,0 +1,6 @@ +```release-note:enhancement +compute: added support for pd-balanced disk type for `google_compute_instance` +``` +```release-note:enhancement +container: added support for pd-balanced disk type for `google_container_node_pool` +``` diff --git a/google/node_config.go b/google/node_config.go index 652aa419a3a..4d157d74f6a 100644 --- a/google/node_config.go +++ b/google/node_config.go @@ -38,7 +38,7 @@ func schemaNodeConfig() *schema.Schema { Optional: true, Computed: true, ForceNew: true, - ValidateFunc: validation.StringInSlice([]string{"pd-standard", "pd-ssd"}, false), + ValidateFunc: validation.StringInSlice([]string{"pd-standard", "pd-balanced", "pd-ssd"}, false), }, "guest_accelerator": { diff --git a/google/resource_compute_instance.go b/google/resource_compute_instance.go index a77b1388ab0..48a0173db70 100644 --- a/google/resource_compute_instance.go +++ b/google/resource_compute_instance.go @@ -154,8 +154,8 @@ func resourceComputeInstance() *schema.Resource { AtLeastOneOf: initializeParamsKeys, Computed: true, ForceNew: true, - ValidateFunc: validation.StringInSlice([]string{"pd-standard", "pd-ssd"}, false), - Description: `The GCE disk type. One of pd-standard or pd-ssd.`, + ValidateFunc: validation.StringInSlice([]string{"pd-standard", "pd-ssd", "pd-balanced"}, false), + Description: `The GCE disk type. One of pd-standard, pd-ssd or pd-balanced.`, }, "image": { diff --git a/google/resource_compute_instance_template.go b/google/resource_compute_instance_template.go index 0396b8cb866..63ec70cbce2 100644 --- a/google/resource_compute_instance_template.go +++ b/google/resource_compute_instance_template.go @@ -134,7 +134,7 @@ func resourceComputeInstanceTemplate() *schema.Resource { Optional: true, ForceNew: true, Computed: true, - Description: `The GCE disk type. Can be either "pd-ssd", "local-ssd", or "pd-standard".`, + Description: `The GCE disk type. Can be either "pd-ssd", "local-ssd", "pd-balanced" or "pd-standard".`, }, "labels": { diff --git a/website/docs/r/compute_instance.html.markdown b/website/docs/r/compute_instance.html.markdown index 6b2163400ab..8150c41d534 100644 --- a/website/docs/r/compute_instance.html.markdown +++ b/website/docs/r/compute_instance.html.markdown @@ -203,7 +203,7 @@ The `initialize_params` block supports: * `size` - (Optional) The size of the image in gigabytes. If not specified, it will inherit the size of its base image. -* `type` - (Optional) The GCE disk type. May be set to pd-standard or pd-ssd. +* `type` - (Optional) The GCE disk type. May be set to pd-standard, pd-balanced or pd-ssd. * `image` - (Optional) The image from which to initialize this disk. This can be one of: the image's `self_link`, `projects/{project}/global/images/{image}`, diff --git a/website/docs/r/compute_instance_template.html.markdown b/website/docs/r/compute_instance_template.html.markdown index 4b2f154802f..032d25d0339 100644 --- a/website/docs/r/compute_instance_template.html.markdown +++ b/website/docs/r/compute_instance_template.html.markdown @@ -281,7 +281,7 @@ The `disk` block supports: ~> **Note:** Either `source` or `source_image` is **required** when creating a new instance except for when creating a local SSD. Check the API [docs](https://cloud.google.com/compute/docs/reference/rest/v1/instanceTemplates/insert) for details. * `disk_type` - (Optional) The GCE disk type. Can be either `"pd-ssd"`, - `"local-ssd"`, or `"pd-standard"`. + `"local-ssd"`, `"pd-balanced"` or `"pd-standard"`. * `disk_size_gb` - (Optional) The size of the image in gigabytes. If not specified, it will inherit the size of its base image. For SCRATCH disks, diff --git a/website/docs/r/container_cluster.html.markdown b/website/docs/r/container_cluster.html.markdown index 931d77459ba..c2ac1ac28a9 100644 --- a/website/docs/r/container_cluster.html.markdown +++ b/website/docs/r/container_cluster.html.markdown @@ -554,7 +554,7 @@ The `node_config` block supports: in GB. The smallest allowed disk size is 10GB. Defaults to 100GB. * `disk_type` - (Optional) Type of the disk attached to each node - (e.g. 'pd-standard' or 'pd-ssd'). If unspecified, the default disk type is 'pd-standard' + (e.g. 'pd-standard', 'pd-balanced' or 'pd-ssd'). If unspecified, the default disk type is 'pd-standard' * `guest_accelerator` - (Optional) List of the type and count of accelerator cards attached to the instance. Structure documented below.