Skip to content

Commit

Permalink
Add support for pd-balanced disk type (#3827) (#7108)
Browse files Browse the repository at this point in the history
* add support for pd-balanced

* Update products/compute/api.yaml

Co-authored-by: Sam Levenick <[email protected]>

Co-authored-by: Sam Levenick <[email protected]>
Signed-off-by: Modular Magician <[email protected]>

Co-authored-by: Sam Levenick <[email protected]>
  • Loading branch information
modular-magician and slevenick authored Aug 25, 2020
1 parent 529b0ab commit a9bc0d0
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 7 deletions.
6 changes: 6 additions & 0 deletions .changelog/3827.txt
Original file line number Diff line number Diff line change
@@ -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`
```
2 changes: 1 addition & 1 deletion google/node_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions google/resource_compute_instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion google/resource_compute_instance_template.go
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/compute_instance.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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}`,
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/compute_instance_template.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/container_cluster.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit a9bc0d0

Please sign in to comment.