Skip to content

Commit ebc5e55

Browse files
authored
Revert "Support IPV6_ONLY configurations for compute API (#12283)"
This reverts commit aa87d47.
1 parent 458c81a commit ebc5e55

7 files changed

+7
-11
lines changed

mmv1/products/compute/Subnetwork.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,6 @@ properties:
410410
enum_values:
411411
- 'IPV4_ONLY'
412412
- 'IPV4_IPV6'
413-
- 'IPV6_ONLY'
414413
- name: 'ipv6AccessType'
415414
type: Enum
416415
description: |

mmv1/third_party/terraform/services/compute/resource_compute_instance.go.tmpl

+2-3
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ func ResourceComputeInstance() *schema.Resource {
535535
Type: schema.TypeString,
536536
Optional: true,
537537
Computed: true,
538-
ValidateFunc: validation.StringInSlice([]string{"IPV4_ONLY", "IPV4_IPV6", "IPV6_ONLY", ""}, false),
538+
ValidateFunc: validation.StringInSlice([]string{"IPV4_ONLY", "IPV4_IPV6", ""}, false),
539539
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.`,
540540
},
541541

@@ -547,8 +547,7 @@ func ResourceComputeInstance() *schema.Resource {
547547

548548
"ipv6_access_config": {
549549
Type: schema.TypeList,
550-
Optional: true,
551-
Computed: true,
550+
Optional: true,
552551
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.`,
553552
Elem: &schema.Resource{
554553
Schema: map[string]*schema.Schema{

mmv1/third_party/terraform/services/compute/resource_compute_instance_template.go.tmpl

+1-2
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ Google Cloud KMS.`,
555555
Optional: true,
556556
Computed: true,
557557
ForceNew: true,
558-
ValidateFunc: validation.StringInSlice([]string{"IPV4_ONLY", "IPV4_IPV6", "IPV6_ONLY", ""}, false),
558+
ValidateFunc: validation.StringInSlice([]string{"IPV4_ONLY", "IPV4_IPV6", ""}, false),
559559
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.`,
560560
},
561561

@@ -569,7 +569,6 @@ Google Cloud KMS.`,
569569
"ipv6_access_config": {
570570
Type: schema.TypeList,
571571
Optional: true,
572-
Computed: true,
573572
ForceNew: true,
574573
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.`,
575574
Elem: &schema.Resource{

mmv1/third_party/terraform/services/compute/resource_compute_region_instance_template.go.tmpl

+1-2
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ Google Cloud KMS.`,
524524
Optional: true,
525525
Computed: true,
526526
ForceNew: true,
527-
ValidateFunc: validation.StringInSlice([]string{"IPV4_ONLY", "IPV4_IPV6","IPV6_ONLY", ""}, false),
527+
ValidateFunc: validation.StringInSlice([]string{"IPV4_ONLY", "IPV4_IPV6", ""}, false),
528528
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.`,
529529
},
530530

@@ -538,7 +538,6 @@ Google Cloud KMS.`,
538538
"ipv6_access_config": {
539539
Type: schema.TypeList,
540540
Optional: true,
541-
Computed: true,
542541
ForceNew: true,
543542
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.`,
544543
Elem: &schema.Resource{

mmv1/third_party/terraform/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

mmv1/third_party/terraform/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

mmv1/third_party/terraform/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

0 commit comments

Comments
 (0)