Merge pull request #60 from gruntwork-io/yori-fix-cluster-recreate

Fix cluster recreate on reapply

modules/gke-cluster/main.tf

@@ -122,6 +122,14 @@ resource "google_container_cluster" "cluster" {
       start_time = var.maintenance_start_time
     }
   }
+
+  lifecycle {
+    ignore_changes = [
+      # Since we provide `remove_default_node_pool = true`, the `node_config` is only relevant for a valid construction of
+      # the GKE cluster in the initial creation. As such, any changes to the `node_config` should be ignored.
+      "node_config",
+    ]
+  }
 }
 
 # ---------------------------------------------------------------------------------------------------------------------

test/gke_cluster_test.go

@@ -12,12 +12,23 @@ import (
 	"github.com/gruntwork-io/terratest/modules/shell"
 	"github.com/gruntwork-io/terratest/modules/terraform"
 	test_structure "github.com/gruntwork-io/terratest/modules/test-structure"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 func TestGKECluster(t *testing.T) {
 	t.Parallel()
 
+	// For convenience - uncomment these when doing local testing if you need to skip any sections.
+	//os.Setenv("SKIP_", "true")  // Does not skip any sections, but avoids copying to a temp dir
+	//os.Setenv("SKIP_create_test_copy_of_examples", "true")
+	//os.Setenv("SKIP_create_terratest_options", "true")
+	//os.Setenv("SKIP_terraform_apply", "true")
+	//os.Setenv("SKIP_configure_kubectl", "true")
+	//os.Setenv("SKIP_wait_for_workers", "true")
+	//os.Setenv("SKIP_terraform_verify_plan_noop", "true")
+	//os.Setenv("SKIP_cleanup", "true")
+
 	var testcases = []struct {
 		testName          string
 		exampleFolder     string
@@ -48,14 +59,6 @@ func TestGKECluster(t *testing.T) {
 		t.Run(testCase.testName, func(t *testing.T) {
 			t.Parallel()
 
-			// Uncomment any of the following to skip that section during the test
-			//os.Setenv("SKIP_create_test_copy_of_examples", "true")
-			//os.Setenv("SKIP_create_terratest_options", "true")
-			//os.Setenv("SKIP_terraform_apply", "true")
-			//os.Setenv("SKIP_configure_kubectl", "true")
-			//os.Setenv("SKIP_wait_for_workers", "true")
-			//os.Setenv("SKIP_cleanup", "true")
-
 			// Create a directory path that won't conflict
 			workingDir := filepath.Join(".", "stages", testCase.testName)
 
@@ -121,6 +124,12 @@ func TestGKECluster(t *testing.T) {
 				kubectlOptions := test_structure.LoadKubectlOptions(t, workingDir)
 				verifyGkeNodesAreReady(t, kubectlOptions)
 			})
+
+			test_structure.RunTestStage(t, "terraform_verify_plan_noop", func() {
+				gkeClusterTerratestOptions := test_structure.LoadTerraformOptions(t, workingDir)
+				exitCode := terraform.InitAndPlan(t, gkeClusterTerratestOptions)
+				assert.Equal(t, exitCode, 0)
+			})
 		})
 	}
 }