public/terraform-provider-google
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-google.git synced 2024-07-03 08:42:39 +00:00
Code Issues Projects Releases Wiki Activity

Duplicate what tpgb does for master_ipv4_cidr_block (#2661)

Browse Source 
Looks like we missed a couple lines while cherrypicking; copied these from tpgb.
This commit is contained in:
Riley Karson 2018-12-13 10:56:59 -08:00 committed by GitHub
parent 73d127a387
commit 4a0ee14304
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
google/resource_container_cluster.go
View File

@ -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": {