From 68ff71846559b6f4bdc2442f0e0803497f2ac749 Mon Sep 17 00:00:00 2001 From: Riley Karson Date: Wed, 22 Jan 2020 13:05:22 -0800 Subject: [PATCH] Mark GKE peering_name GA (#3001) Merged PR #3001. --- build/terraform | 2 +- build/terraform-beta | 2 +- .../terraform/resources/resource_container_cluster.go.erb | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/build/terraform b/build/terraform index 9d6d2e1e1739..5df50b3662b0 160000 --- a/build/terraform +++ b/build/terraform @@ -1 +1 @@ -Subproject commit 9d6d2e1e17396b3ce07cc251b6e33fda74840db8 +Subproject commit 5df50b3662b0aaae52b05162ec1e69eff9857511 diff --git a/build/terraform-beta b/build/terraform-beta index b500104342c9..d50541047cfc 160000 --- a/build/terraform-beta +++ b/build/terraform-beta @@ -1 +1 @@ -Subproject commit b500104342c9e10574063bfaf7bee6a20a734dd6 +Subproject commit d50541047cfcb9b13ce8cb438eb1771dc25abb1e diff --git a/third_party/terraform/resources/resource_container_cluster.go.erb b/third_party/terraform/resources/resource_container_cluster.go.erb index 67e2bb273b47..5852a7ae7be0 100644 --- a/third_party/terraform/resources/resource_container_cluster.go.erb +++ b/third_party/terraform/resources/resource_container_cluster.go.erb @@ -798,12 +798,10 @@ func resourceContainerCluster() *schema.Resource { ForceNew: true, ValidateFunc: orEmpty(validation.CIDRNetwork(28, 28)), }, -<%- unless version == 'ga' %> "peering_name": { Type: schema.TypeString, Computed: true, }, -<%- end %> "private_endpoint": { Type: schema.TypeString, Computed: true, @@ -2647,9 +2645,7 @@ func flattenPrivateClusterConfig(c *containerBeta.PrivateClusterConfig) []map[st "enable_private_endpoint": c.EnablePrivateEndpoint, "enable_private_nodes": c.EnablePrivateNodes, "master_ipv4_cidr_block": c.MasterIpv4CidrBlock, -<% unless version == 'ga' -%> "peering_name": c.PeeringName, -<% end -%> "private_endpoint": c.PrivateEndpoint, "public_endpoint": c.PublicEndpoint, },