diff --git a/third_party/terraform/tests/resource_compute_instance_group_manager_test.go.erb b/third_party/terraform/tests/resource_compute_instance_group_manager_test.go.erb index 5bbf1c4a0100..6494b3eba9dc 100644 --- a/third_party/terraform/tests/resource_compute_instance_group_manager_test.go.erb +++ b/third_party/terraform/tests/resource_compute_instance_group_manager_test.go.erb @@ -1186,7 +1186,6 @@ resource "google_compute_instance_group_manager" "igm-instance-template-upgrade" name = "%s" version { - name = "primary" instance_template = "${google_compute_instance_template.igm-instance-template-upgrade.self_link}" } diff --git a/third_party/terraform/website/docs/r/compute_instance_group_manager.html.markdown b/third_party/terraform/website/docs/r/compute_instance_group_manager.html.markdown index 21b2771b528c..3411486a0741 100644 --- a/third_party/terraform/website/docs/r/compute_instance_group_manager.html.markdown +++ b/third_party/terraform/website/docs/r/compute_instance_group_manager.html.markdown @@ -35,10 +35,12 @@ resource "google_compute_instance_group_manager" "appserver" { name = "appserver-igm" base_instance_name = "app" - instance_template = "${google_compute_instance_template.appserver.self_link}" - update_strategy = "NONE" zone = "us-central1-a" + version { + instance_template = "${google_compute_instance_template.appserver.self_link}" + } + target_pools = ["${google_compute_target_pool.appserver.self_link}"] target_size = 2 @@ -91,11 +93,12 @@ The following arguments are supported: appending a hyphen and a random four-character string to the base instance name. -* `instance_template` - (Required, [GA](https://terraform.io/docs/providers/google/provider_versions.html)) The +* `instance_template` - (Deprecated) The full URL to an instance template from which all new instances - will be created. This field is only present in the `google` provider. + will be created. This field is replaced by `version.instance_template`. You must + specify at least one `version` block with an `instance_template`. -* `version` - (Required, [Beta](https://terraform.io/docs/providers/google/provider_versions.html)) Application versions managed by this instance group. Each +* `version` - (Optional) Application versions managed by this instance group. Each version deals with a specific instance template, allowing canary release scenarios. Structure is documented below. @@ -118,11 +121,8 @@ The following arguments are supported: * `project` - (Optional) The ID of the project in which the resource belongs. If it is not provided, the provider project is used. -* `update_strategy` - (Optional, Default `"REPLACE"`) If the `instance_template` - resource is modified, a value of `"NONE"` will prevent any of the managed - instances from being restarted by Terraform. A value of `"REPLACE"` will - restart all of the instances at once. This field is only present in the - `google` provider. +* `update_strategy` - (Deprecated) This field has been deprecated, use `update_policy` + instead. * `target_size` - (Optional) The target number of running instances for this managed instance group. This value should always be explicitly set unless this resource is attached to @@ -138,10 +138,10 @@ The following arguments are supported: --- -* `auto_healing_policies` - (Optional, [Beta](https://terraform.io/docs/providers/google/provider_versions.html)) The autohealing policies for this managed instance +* `auto_healing_policies` - (Optional) The autohealing policies for this managed instance group. You can specify only one value. Structure is documented below. For more information, see the [official documentation](https://cloud.google.com/compute/docs/instance-groups/creating-groups-of-managed-instances#monitoring_groups). -* `update_policy` - (Optional, [Beta](https://terraform.io/docs/providers/google/provider_versions.html)) The update policy for this managed instance group. Structure is documented below. For more information, see the [official documentation](https://cloud.google.com/compute/docs/instance-groups/updating-managed-instance-groups) and [API](https://cloud.google.com/compute/docs/reference/rest/beta/instanceGroupManagers/patch) +* `update_policy` - (Optional) The update policy for this managed instance group. Structure is documented below. For more information, see the [official documentation](https://cloud.google.com/compute/docs/instance-groups/updating-managed-instance-groups) and [API](https://cloud.google.com/compute/docs/reference/rest/beta/instanceGroupManagers/patch) - - - The `update_policy` block supports: diff --git a/third_party/terraform/website/docs/r/compute_region_instance_group_manager.html.markdown b/third_party/terraform/website/docs/r/compute_region_instance_group_manager.html.markdown index 908918f255c2..aa0e4b5da4b7 100644 --- a/third_party/terraform/website/docs/r/compute_region_instance_group_manager.html.markdown +++ b/third_party/terraform/website/docs/r/compute_region_instance_group_manager.html.markdown @@ -35,7 +35,10 @@ resource "google_compute_region_instance_group_manager" "appserver" { name = "appserver-igm" base_instance_name = "app" - instance_template = "${google_compute_instance_template.appserver.self_link}" + + version { + instance_template = "${google_compute_instance_template.appserver.self_link}" + } region = "us-central1" distribution_policy_zones = ["us-central1-a", "us-central1-f"] @@ -55,13 +58,12 @@ resource "google_compute_region_instance_group_manager" "appserver" { ``` -## Example Usage with multiple versions (`google-beta` provider) +## Example Usage with multiple versions ```hcl resource "google_compute_region_instance_group_manager" "appserver" { name = "appserver-igm" base_instance_name = "app" - update_strategy = "NONE" region = "us-central1" target_size = 5 @@ -90,11 +92,12 @@ The following arguments are supported: appending a hyphen and a random four-character string to the base instance name. -* `instance_template` - (Required, [GA](https://terraform.io/docs/providers/google/provider_versions.html)) The full URL to an instance template from - which all new instances will be created. This field is only present in the - `google` provider. +* `instance_template` - (Deprecated) The + full URL to an instance template from which all new instances + will be created. This field is replaced by `version.instance_template`. You must + specify at least one `version` block with an `instance_template`. -* `version` - (Required, [Beta](https://terraform.io/docs/providers/google/provider_versions.html)) Application versions managed by this instance group. Each +* `version` - (Optional) Application versions managed by this instance group. Each version deals with a specific instance template, allowing canary release scenarios. Structure is documented below. @@ -130,11 +133,11 @@ The following arguments are supported: --- -* `auto_healing_policies` - (Optional, [Beta](https://terraform.io/docs/providers/google/provider_versions.html)) The autohealing policies for this managed instance +* `auto_healing_policies` - (Optional) The autohealing policies for this managed instance group. You can specify only one value. Structure is documented below. For more information, see the [official documentation](https://cloud.google.com/compute/docs/instance-groups/creating-groups-of-managed-instances#monitoring_groups). -* `update_policy` - (Optional, [Beta](https://terraform.io/docs/providers/google/provider_versions.html)) The update policy for this managed instance group. Structure is documented below. For more information, see the [official documentation](https://cloud.google.com/compute/docs/instance-groups/updating-managed-instance-groups) and [API](https://cloud.google.com/compute/docs/reference/rest/beta/regionInstanceGroupManagers/patch) +* `update_policy` - (Optional) The update policy for this managed instance group. Structure is documented below. For more information, see the [official documentation](https://cloud.google.com/compute/docs/instance-groups/updating-managed-instance-groups) and [API](https://cloud.google.com/compute/docs/reference/rest/beta/regionInstanceGroupManagers/patch) * `distribution_policy_zones` - (Optional) The distribution policy for this managed instance