From 4a0ee14304cba9428fd9f82e400c2c76913a59ad Mon Sep 17 00:00:00 2001 From: Riley Karson Date: Thu, 13 Dec 2018 10:56:59 -0800 Subject: [PATCH] Duplicate what tpgb does for master_ipv4_cidr_block (#2661) Looks like we missed a couple lines while cherrypicking; copied these from tpgb. --- google/resource_container_cluster.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/google/resource_container_cluster.go b/google/resource_container_cluster.go index c373a649..88a6b761 100644 --- a/google/resource_container_cluster.go +++ b/google/resource_container_cluster.go @@ -584,11 +584,13 @@ func resourceContainerCluster() *schema.Resource { }, "master_ipv4_cidr_block": { - Deprecated: "This field is in beta and will be removed from this provider. Use it in the the google-beta provider instead. See https://terraform.io/docs/providers/google/provider_versions.html for more details.", - Type: schema.TypeString, - Optional: true, - ForceNew: true, - ValidateFunc: validation.CIDRNetwork(28, 28), + Deprecated: "This field is in beta and will be removed from this provider. Use it in the the google-beta provider instead. See https://terraform.io/docs/providers/google/provider_versions.html for more details.", + Type: schema.TypeString, + ConflictsWith: []string{"private_cluster_config"}, + Computed: true, + Optional: true, + ForceNew: true, + ValidateFunc: validation.CIDRNetwork(28, 28), }, "resource_labels": {