Fix node pool tests. (#3475) (#6383)

Signed-off-by: Modular Magician <[email protected]>
hashicorp · May 14, 2020 · 2e8f4be · 2e8f4be
1 parent 707a1e6
commit 2e8f4be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.changelog/3475.txt b/.changelog/3475.txt
@@ -0,0 +1,2 @@
+```release-note:none
+```
diff --git a/google/resource_container_node_pool_test.go b/google/resource_container_node_pool_test.go
@@ -463,6 +463,10 @@ func TestAccContainerNodePool_resize(t *testing.T) {
 func TestAccContainerNodePool_version(t *testing.T) {
 	t.Parallel()
 
+	// Re-enable this test when there is more than one acceptable node pool version
+	// for the current master version
+	t.Skip()
+
 	cluster := fmt.Sprintf("tf-test-cluster-%s", randString(t, 10))
 	np := fmt.Sprintf("tf-test-nodepool-%s", randString(t, 10))
 
@@ -1096,7 +1100,6 @@ resource "google_container_cluster" "cluster" {
   name               = "%s"
   location           = "us-central1-c"
   initial_node_count = 1
-  node_version       = data.google_container_engine_versions.central1c.latest_node_version
   min_master_version = data.google_container_engine_versions.central1c.latest_master_version
 }