From 7f46f5c4fc0da7600b1d49fd7e38dc119b6cf037 Mon Sep 17 00:00:00 2001 From: The Magician Date: Thu, 11 Apr 2019 17:24:13 -0700 Subject: [PATCH] Add conflicts_with for cluster remove_default_node_pool and node_pool (#3422) Signed-off-by: Modular Magician --- google/resource_container_cluster.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/google/resource_container_cluster.go b/google/resource_container_cluster.go index 18758625..b016c0ba 100644 --- a/google/resource_container_cluster.go +++ b/google/resource_container_cluster.go @@ -437,6 +437,7 @@ func resourceContainerCluster() *schema.Resource { Elem: &schema.Resource{ Schema: schemaNodePool, }, + ConflictsWith: []string{"remove_default_node_pool"}, }, "node_version": { @@ -568,8 +569,9 @@ func resourceContainerCluster() *schema.Resource { }, "remove_default_node_pool": { - Type: schema.TypeBool, - Optional: true, + Type: schema.TypeBool, + Optional: true, + ConflictsWith: []string{"node_pool"}, }, "private_cluster": {