Skip to content

Commit aa81682

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

9 files changed

+12
-12
lines changed

.changelog/12408.txt

Lines changed: 3 additions & 0 deletions
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/services/compute/resource_compute_instance.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ func ResourceComputeInstance() *schema.Resource {
506506
Type: schema.TypeString,
507507
Optional: true,
508508
Computed: true,
509-
ValidateFunc: validation.StringInSlice([]string{"IPV4_ONLY", "IPV4_IPV6", "IPV6_ONLY", ""}, false),
509+
ValidateFunc: validation.StringInSlice([]string{"IPV4_ONLY", "IPV4_IPV6", ""}, false),
510510
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.`,
511511
},
512512

@@ -519,7 +519,6 @@ func ResourceComputeInstance() *schema.Resource {
519519
"ipv6_access_config": {
520520
Type: schema.TypeList,
521521
Optional: true,
522-
Computed: true,
523522
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.`,
524523
Elem: &schema.Resource{
525524
Schema: map[string]*schema.Schema{

google/services/compute/resource_compute_instance_template.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ Google Cloud KMS.`,
513513
Optional: true,
514514
Computed: true,
515515
ForceNew: true,
516-
ValidateFunc: validation.StringInSlice([]string{"IPV4_ONLY", "IPV4_IPV6", "IPV6_ONLY", ""}, false),
516+
ValidateFunc: validation.StringInSlice([]string{"IPV4_ONLY", "IPV4_IPV6", ""}, false),
517517
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.`,
518518
},
519519

@@ -527,7 +527,6 @@ Google Cloud KMS.`,
527527
"ipv6_access_config": {
528528
Type: schema.TypeList,
529529
Optional: true,
530-
Computed: true,
531530
ForceNew: true,
532531
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.`,
533532
Elem: &schema.Resource{

google/services/compute/resource_compute_region_instance_template.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ Google Cloud KMS.`,
496496
Optional: true,
497497
Computed: true,
498498
ForceNew: true,
499-
ValidateFunc: validation.StringInSlice([]string{"IPV4_ONLY", "IPV4_IPV6", "IPV6_ONLY", ""}, false),
499+
ValidateFunc: validation.StringInSlice([]string{"IPV4_ONLY", "IPV4_IPV6", ""}, false),
500500
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.`,
501501
},
502502

@@ -510,7 +510,6 @@ Google Cloud KMS.`,
510510
"ipv6_access_config": {
511511
Type: schema.TypeList,
512512
Optional: true,
513-
Computed: true,
514513
ForceNew: true,
515514
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.`,
516515
Elem: &schema.Resource{

google/services/compute/resource_compute_subnetwork.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,9 +330,9 @@ E.g. 'networkconnectivity.googleapis.com/projects/{project}/locations/global/int
330330
Type: schema.TypeString,
331331
Computed: true,
332332
Optional: true,
333-
ValidateFunc: verify.ValidateEnum([]string{"IPV4_ONLY", "IPV4_IPV6", "IPV6_ONLY", ""}),
333+
ValidateFunc: verify.ValidateEnum([]string{"IPV4_ONLY", "IPV4_IPV6", ""}),
334334
Description: `The stack type for this subnet to identify whether the IPv6 feature is enabled or not.
335-
If not specified IPV4_ONLY will be used. Possible values: ["IPV4_ONLY", "IPV4_IPV6", "IPV6_ONLY"]`,
335+
If not specified IPV4_ONLY will be used. Possible values: ["IPV4_ONLY", "IPV4_IPV6"]`,
336336
},
337337
"creation_timestamp": {
338338
Type: schema.TypeString,

website/docs/r/compute_instance.html.markdown

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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)