update node

Author: apeabody

examples/node_pool/main.tf

@@ -102,7 +102,7 @@ module "gke" {
     {
       name          = "pool-06"
       node_count    = 1
-      machine_type  = "n1-highmem-96"
+      machine_type  = "c2-standard-30"
       node_affinity = "{\"key\": \"compute.googleapis.com/node-group-name\", \"operator\": \"IN\", \"values\": [\"${google_compute_node_group.soletenant-nodes.name}\"]}"
     },
   ]
@@ -170,7 +170,7 @@ resource "google_compute_node_template" "soletenant-tmpl" {
   name   = "soletenant-tmpl-${var.cluster_name_suffix}"
   region = var.region
 
-  node_type = "n1-node-96-624"
+  node_type = "c2-node-60-240"
 }
 
 resource "google_compute_node_group" "soletenant-nodes" {

test/integration/node_pool/node_pool_test.go

@@ -43,6 +43,7 @@ func TestNodePool(t *testing.T) {
 		nodeServiceAccount := bpt.GetStringOutput("compute_engine_service_account")
 
 		// Retrieve Project CAI
+		time.Sleep(5 * time.Minute)
 		projectCAI := cai.GetProjectResources(t, projectId, cai.WithAssetTypes([]string{"container.googleapis.com/Cluster", "k8s.io/Node"}))
 
 		// Retrieve Cluster from CAI
@@ -61,8 +62,9 @@ func TestNodePool(t *testing.T) {
 
 		// Cluster (and listed node pools) Assertions
 		testutils.TGKEAssertGolden(assert, g, &cluster, []string{"pool-01", "pool-02", "pool-03", "pool-04", "pool-05"}, []string{"monitoringConfig.componentConfig.enableComponents"}) // TODO: enableComponents is UL
-
+		fmt.Println("DEBUG: K8s Assertions")
 		// K8s Assertions
+		assert.True(projectCAI.Get("#(resource.data.metadata.labels.node_pool==\"pool-01\").resource.data.spec.taints").Exists(), "pool-01 taints do not exist")
 		assert.JSONEq(`[
 				{
 					"effect": "PreferNoSchedule",
@@ -76,6 +78,7 @@ func TestNodePool(t *testing.T) {
 				}
 			]`,
 			projectCAI.Get("#(resource.data.metadata.labels.node_pool==\"pool-01\").resource.data.spec.taints").String(), "has the expected taints")
+		assert.True(projectCAI.Get("#(resource.data.metadata.labels.node_pool==\"pool-02\").resource.data.spec.taints").Exists(), "pool-02 taints do not exist")
 		assert.JSONEq(`[
 				{
 					"effect": "PreferNoSchedule",
@@ -89,6 +92,7 @@ func TestNodePool(t *testing.T) {
 				}
 			]`,
 			projectCAI.Get("#(resource.data.metadata.labels.node_pool==\"pool-02\").resource.data.spec.taints").String(), "has the expected all-pools-example taint")
+		assert.True(projectCAI.Get("#(resource.data.metadata.labels.node_pool==\"pool-03\").resource.data.spec.taints").Exists(), "pool-03 taints do not exist")
 		assert.JSONEq(`[
 				{
 					"effect": "PreferNoSchedule",

test/integration/testutils/utils.go

@@ -94,13 +94,10 @@ func TGKEAssertGolden(assert *assert.Assertions, golden *golden.GoldenFile, clus
 	})
 
 	// Cluster assertions
-	fmt.Sprintf("DEBUG: Cluster assertions")
 	golden.JSONPathEqs(assert, *clusterJson, clusterCheckPaths)
 
 	// NodePool assertions
-	fmt.Sprintf("DEBUG: NodePool assertions")
 	for _, nodePool := range nodePools {
-		fmt.Sprintf("DEBUG: NodePool assertions for %s", nodePool)
 		assert.Truef(clusterJson.Get(fmt.Sprintf("nodePools.#(name==%s).name", nodePool)).Exists(), "NodePool not found: %s", nodePool)
 
 		nodeCheckPaths := utils.GetTerminalJSONPaths(golden.GetJSON().Get(fmt.Sprintf("nodePools.#(name==%s)", nodePool)))