diff --git a/.changelog/4894.txt b/.changelog/4894.txt new file mode 100644 index 0000000000..78672ed1ad --- /dev/null +++ b/.changelog/4894.txt @@ -0,0 +1,3 @@ +```release-note:bug +container: allowed setting `node_config.service_account` at the same time as `enable_autopilot = true` for `google_container_cluster` +``` diff --git a/google-beta/resource_container_cluster.go b/google-beta/resource_container_cluster.go index 744e99d691..08d68bb5bc 100644 --- a/google-beta/resource_container_cluster.go +++ b/google-beta/resource_container_cluster.go @@ -80,8 +80,6 @@ func clusterSchemaNodeConfig() *schema.Schema { changeFieldSchemaToForceNew(sch) } } - // Autopilot is only applicable for container cluster - nodeConfigSch.ConflictsWith = []string{"enable_autopilot"} return nodeConfigSch } diff --git a/google-beta/resource_dataproc_cluster_test.go b/google-beta/resource_dataproc_cluster_test.go index 79b887900b..8f3596cc80 100644 --- a/google-beta/resource_dataproc_cluster_test.go +++ b/google-beta/resource_dataproc_cluster_test.go @@ -13,9 +13,8 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "google.golang.org/api/googleapi" - dataproc "google.golang.org/api/dataproc/v1beta2" + "google.golang.org/api/googleapi" ) func TestDataprocExtractInitTimeout(t *testing.T) {