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

Revert "Add conflicts_with for cluster remove_default_node_pool and n… (#3497)

Browse Source 
Signed-off-by: Modular Magician <magic-modules@google.com>
This commit is contained in:
The Magician 2019-04-30 12:43:57 -07:00 committed by Riley Karson
parent b21921fad2
commit 5f03562eab
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
google/resource_container_cluster.go
View File

@ -436,7 +436,6 @@ func resourceContainerCluster() *schema.Resource {
Elem: &schema.Resource{
Schema: schemaNodePool,
},
ConflictsWith: []string{"remove_default_node_pool"},
},
"node_version": {
@ -569,9 +568,8 @@ func resourceContainerCluster() *schema.Resource {
},
"remove_default_node_pool": {
Type: schema.TypeBool,
Optional: true,
ConflictsWith: []string{"node_pool"},
Type: schema.TypeBool,
Optional: true,
},
"private_cluster_config": {