Skip to content

Commit d7ad571

Browse files
Revert "Support IPV6_ONLY configurations for compute API" (#12408) (#8773)
[upstream:0ec5573ce1f0a975bb38bbdbed970ab99fdcc739] Signed-off-by: Modular Magician <[email protected]>
1 parent 77678d2 commit d7ad571

9 files changed

+12
-12
lines changed

.changelog/12408.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
compute: `stack_type` can now be set to `IPV6_ONLY` on `google_compute_subnetwork`, `google_compute_instance`, `google_compute_instance_template` and `google_compute_region_instance_template`. REVERTED: PLEASE REMOVE
3+
```

google-beta/services/compute/resource_compute_instance.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ func ResourceComputeInstance() *schema.Resource {
522522
Type: schema.TypeString,
523523
Optional: true,
524524
Computed: true,
525-
ValidateFunc: validation.StringInSlice([]string{"IPV4_ONLY", "IPV4_IPV6", "IPV6_ONLY", ""}, false),
525+
ValidateFunc: validation.StringInSlice([]string{"IPV4_ONLY", "IPV4_IPV6", ""}, false),
526526
Description: `The stack type for this network interface to identify whether the IPv6 feature is enabled or not. If not specified, IPV4_ONLY will be used.`,
527527
},
528528

@@ -535,7 +535,6 @@ func ResourceComputeInstance() *schema.Resource {
535535
"ipv6_access_config": {
536536
Type: schema.TypeList,
537537
Optional: true,
538-
Computed: true,
539538
Description: `An array of IPv6 access configurations for this interface. Currently, only one IPv6 access config, DIRECT_IPV6, is supported. If there is no ipv6AccessConfig specified, then this instance will have no external IPv6 Internet access.`,
540539
Elem: &schema.Resource{
541540
Schema: map[string]*schema.Schema{

google-beta/services/compute/resource_compute_instance_template.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ Google Cloud KMS.`,
539539
Optional: true,
540540
Computed: true,
541541
ForceNew: true,
542-
ValidateFunc: validation.StringInSlice([]string{"IPV4_ONLY", "IPV4_IPV6", "IPV6_ONLY", ""}, false),
542+
ValidateFunc: validation.StringInSlice([]string{"IPV4_ONLY", "IPV4_IPV6", ""}, false),
543543
Description: `The stack type for this network interface to identify whether the IPv6 feature is enabled or not. If not specified, IPV4_ONLY will be used.`,
544544
},
545545

@@ -553,7 +553,6 @@ Google Cloud KMS.`,
553553
"ipv6_access_config": {
554554
Type: schema.TypeList,
555555
Optional: true,
556-
Computed: true,
557556
ForceNew: true,
558557
Description: `An array of IPv6 access configurations for this interface. Currently, only one IPv6 access config, DIRECT_IPV6, is supported. If there is no ipv6AccessConfig specified, then this instance will have no external IPv6 Internet access.`,
559558
Elem: &schema.Resource{

google-beta/services/compute/resource_compute_region_instance_template.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ Google Cloud KMS.`,
512512
Optional: true,
513513
Computed: true,
514514
ForceNew: true,
515-
ValidateFunc: validation.StringInSlice([]string{"IPV4_ONLY", "IPV4_IPV6", "IPV6_ONLY", ""}, false),
515+
ValidateFunc: validation.StringInSlice([]string{"IPV4_ONLY", "IPV4_IPV6", ""}, false),
516516
Description: `The stack type for this network interface to identify whether the IPv6 feature is enabled or not. If not specified, IPV4_ONLY will be used.`,
517517
},
518518

@@ -526,7 +526,6 @@ Google Cloud KMS.`,
526526
"ipv6_access_config": {
527527
Type: schema.TypeList,
528528
Optional: true,
529-
Computed: true,
530529
ForceNew: true,
531530
Description: `An array of IPv6 access configurations for this interface. Currently, only one IPv6 access config, DIRECT_IPV6, is supported. If there is no ipv6AccessConfig specified, then this instance will have no external IPv6 Internet access.`,
532531
Elem: &schema.Resource{

google-beta/services/compute/resource_compute_subnetwork.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -339,9 +339,9 @@ E.g. 'networkconnectivity.googleapis.com/projects/{project}/locations/global/int
339339
Type: schema.TypeString,
340340
Computed: true,
341341
Optional: true,
342-
ValidateFunc: verify.ValidateEnum([]string{"IPV4_ONLY", "IPV4_IPV6", "IPV6_ONLY", ""}),
342+
ValidateFunc: verify.ValidateEnum([]string{"IPV4_ONLY", "IPV4_IPV6", ""}),
343343
Description: `The stack type for this subnet to identify whether the IPv6 feature is enabled or not.
344-
If not specified IPV4_ONLY will be used. Possible values: ["IPV4_ONLY", "IPV4_IPV6", "IPV6_ONLY"]`,
344+
If not specified IPV4_ONLY will be used. Possible values: ["IPV4_ONLY", "IPV4_IPV6"]`,
345345
},
346346
"creation_timestamp": {
347347
Type: schema.TypeString,

website/docs/r/compute_instance.html.markdown

+1-1
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ is desired, you will need to modify your state file manually using
399399

400400
* `network_attachment` - (Optional) [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html) The URL of the network attachment that this interface should connect to in the following format: `projects/{projectNumber}/regions/{region_name}/networkAttachments/{network_attachment_name}`.
401401

402-
* `stack_type` - (Optional) The stack type for this network interface to identify whether the IPv6 feature is enabled or not. Values are IPV4_IPV6, IPV6_ONLY or IPV4_ONLY. If not specified, IPV4_ONLY will be used.
402+
* `stack_type` - (Optional) The stack type for this network interface to identify whether the IPv6 feature is enabled or not. Values are IPV4_IPV6 or IPV4_ONLY. If not specified, IPV4_ONLY will be used.
403403

404404
* `ipv6_access_config` - (Optional) An array of IPv6 access configurations for this interface.
405405
Currently, only one IPv6 access config, DIRECT_IPV6, is supported. If there is no ipv6AccessConfig

website/docs/r/compute_instance_template.html.markdown

+1-1
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ The following arguments are supported:
563563

564564
* `nic_type` - (Optional) The type of vNIC to be used on this interface. Possible values: GVNIC, VIRTIO_NET. In the beta provider the additional values of MRDMA and IRDMA are supported.
565565

566-
* `stack_type` - (Optional) The stack type for this network interface to identify whether the IPv6 feature is enabled or not. Values are IPV4_IPV6, IPV6_ONLY or IPV4_ONLY. If not specified, IPV4_ONLY will be used.
566+
* `stack_type` - (Optional) The stack type for this network interface to identify whether the IPv6 feature is enabled or not. Values are IPV4_IPV6 or IPV4_ONLY. If not specified, IPV4_ONLY will be used.
567567

568568
* `ipv6_access_config` - (Optional) An array of IPv6 access configurations for this interface.
569569
Currently, only one IPv6 access config, DIRECT_IPV6, is supported. If there is no ipv6AccessConfig

website/docs/r/compute_region_instance_template.html.markdown

+1-1
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ The following arguments are supported:
529529

530530
* `nic_type` - (Optional) The type of vNIC to be used on this interface. Possible values: GVNIC, VIRTIO_NET. In the beta provider the additional values of MRDMA and IRDMA are supported.
531531

532-
* `stack_type` - (Optional) The stack type for this network interface to identify whether the IPv6 feature is enabled or not. Values are IPV4_IPV6, IPV6_ONLY or IPV4_ONLY. If not specified, IPV4_ONLY will be used.
532+
* `stack_type` - (Optional) The stack type for this network interface to identify whether the IPv6 feature is enabled or not. Values are IPV4_IPV6 or IPV4_ONLY. If not specified, IPV4_ONLY will be used.
533533

534534
* `ipv6_access_config` - (Optional) An array of IPv6 access configurations for this interface.
535535
Currently, only one IPv6 access config, DIRECT_IPV6, is supported. If there is no ipv6AccessConfig

website/docs/r/compute_subnetwork.html.markdown

+1-1
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ The following arguments are supported:
421421
(Optional)
422422
The stack type for this subnet to identify whether the IPv6 feature is enabled or not.
423423
If not specified IPV4_ONLY will be used.
424-
Possible values are: `IPV4_ONLY`, `IPV4_IPV6`, `IPV6_ONLY`.
424+
Possible values are: `IPV4_ONLY`, `IPV4_IPV6`.
425425

426426
* `ipv6_access_type` -
427427
(Optional)

0 commit comments

Comments
 (0)