update node

Author: apeabody

autogen/main/README.md

@@ -238,7 +238,7 @@ The node_pools variable takes the following parameters:
 | max_count | Maximum number of nodes in the NodePool. Must be >= min_count. Cannot be used with total limits. | 100 | Optional |
 | total_max_count | Total maximum number of nodes in the NodePool. Must be >= min_count. Cannot be used with per zone limits. | null | Optional |
 | max_pods_per_node | The maximum number of pods per node in this cluster | null | Optional |
-| strategy | The upgrade stragey to be used for upgrading the nodes. Valid values of state are: `SURGE` or `BLUE_GREEN` | "SURGE" | Optional |
+| strategy | The upgrade stragey to be used for upgrading the nodes. Valid values of state are: `SURGE`, `BLUE_GREEN`, or for flex-start and queued provisioning only `SHORT_LIVED` | "SURGE" | Optional |
 | threads_per_core | Optional The number of threads per physical core. To disable simultaneous multithreading (SMT) set this to 1. If unset, the maximum number of threads supported per core by the underlying processor is assumed | null | Optional |
 | enable_nested_virtualization | Whether the node should have nested virtualization | null | Optional |
 | max_surge | The number of additional nodes that can be added to the node pool during an upgrade. Increasing max_surge raises the number of nodes that can be upgraded simultaneously. Can be set to 0 or greater. Only works with `SURGE` strategy. | 1 | Optional |

examples/node_pool/main.tf

@@ -92,6 +92,8 @@ module "gke" {
       min_count           = 0
       service_account     = var.compute_engine_service_account
       queued_provisioning = true
+      max_surge           = 0
+      strategy            = "SHORT_LIVED"
     },
     {
       name                         = "pool-05"
@@ -102,7 +104,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 +172,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/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)))