Add flex start (#13691) (#9885)

[upstream:ab94f3ad60f67c52ca28d7208018751aaeb995ef]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/13691.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+container: added `flex_start` to `node_config` in `google_container_cluster` and `google_container_node_pool`
+```

google-beta/services/container/node_config.go

@@ -862,6 +862,12 @@ func schemaNodeConfig() *schema.Schema {
 					ForceNew:    true,
 					Description: `The runtime of each node in the node pool in seconds, terminated by 's'. Example: "3600s".`,
 				},
+				"flex_start": {
+					Type:        schema.TypeBool,
+					Optional:    true,
+					ForceNew:    true,
+					Description: `Enables Flex Start provisioning model for the node pool`,
+				},
 			},
 		},
 	}
@@ -1248,6 +1254,10 @@ func expandNodeConfig(v interface{}) *container.NodeConfig {
 		nc.MaxRunDuration = v.(string)
 	}
 
+	if v, ok := nodeConfig["flex_start"]; ok {
+		nc.FlexStart = v.(bool)
+	}
+
 	if v, ok := nodeConfig["host_maintenance_policy"]; ok {
 		nc.HostMaintenancePolicy = expandHostMaintenancePolicy(v)
 	}
@@ -1671,6 +1681,7 @@ func flattenNodeConfig(c *container.NodeConfig, v interface{}) []map[string]inte
 		"node_group":                         c.NodeGroup,
 		"advanced_machine_features":          flattenAdvancedMachineFeaturesConfig(c.AdvancedMachineFeatures),
 		"max_run_duration":                   c.MaxRunDuration,
+		"flex_start":                         c.FlexStart,
 		"sole_tenant_config":                 flattenSoleTenantConfig(c.SoleTenantConfig),
 		"fast_socket":                        flattenFastSocket(c.FastSocket),
 		"resource_manager_tags":              flattenResourceManagerTags(c.ResourceManagerTags),

google-beta/services/container/resource_container_cluster_test.go

@@ -505,6 +505,38 @@ func TestAccContainerCluster_withMaxRunDuration(t *testing.T) {
 	})
 }
 
+func TestAccContainerCluster_withFlexStart(t *testing.T) {
+	t.Parallel()
+
+	clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10))
+	networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster")
+	subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName)
+	npName := fmt.Sprintf("tf-test-node-pool-%s", acctest.RandString(t, 10))
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckContainerClusterDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccContainerCluster_withFlexStart(clusterName, npName, networkName, subnetworkName),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("google_container_cluster.flex_start", "node_pool.0.node_config.0.machine_type", "n1-standard-1"),
+					resource.TestCheckResourceAttr("google_container_cluster.flex_start",
+						"node_pool.0.node_config.0.reservation_affinity.0.consume_reservation_type", "NO_RESERVATION"),
+					resource.TestCheckResourceAttr("google_container_cluster.flex_start", "node_pool.0.node_config.0.flex_start", "true"),
+				),
+			},
+			{
+				ResourceName:            "google_container_cluster.flex_start",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"deletion_protection", "min_master_version", "node_pool.0.node_config.0.taint"},
+			},
+		},
+	})
+}
+
 func TestAccContainerCluster_withILBSubsetting(t *testing.T) {
 	t.Parallel()
 
@@ -7045,6 +7077,52 @@ resource "google_container_cluster" "max_run_duration" {
 `, clusterName, npName, duration, networkName, subnetworkName)
 }
 
+func testAccContainerCluster_withFlexStart(clusterName, npName, networkName, subnetworkName string) string {
+	return fmt.Sprintf(`
+resource "google_container_cluster" "flex_start" {
+  min_master_version = "1.32.3-gke.1717000"
+
+  name                = "%s"
+  location            = "us-central1-a"
+
+  release_channel {
+    channel = "RAPID"
+  }
+
+
+  node_pool {
+    name = "%s"
+    initial_node_count = 0
+	autoscaling {
+	  total_min_node_count = 0
+	  total_max_node_count = 1
+	}
+
+    node_config {
+      machine_type = "n1-standard-1"
+	  flex_start = true
+	  max_run_duration = "604800s"
+	  
+	  reservation_affinity {
+      	consume_reservation_type = "NO_RESERVATION"
+      }
+
+      taint {
+	    key    = "taint_key"
+		value  = "taint_value"
+		effect = "NO_SCHEDULE"
+	  }
+    }
+  }
+
+  deletion_protection = false
+  network             = "%s"
+  subnetwork          = "%s"
+
+}
+`, clusterName, npName, networkName, subnetworkName)
+}
+
 func testAccContainerCluster_withILBSubSetting(clusterName, npName, networkName, subnetworkName string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "confidential_nodes" {

google-beta/services/container/resource_container_node_pool_test.go

@@ -4395,6 +4395,80 @@ resource "google_container_node_pool" "np" {
 `, clusterName, networkName, subnetworkName, np)
 }
 
+func TestAccContainerNodePool_withFlexStart(t *testing.T) {
+	t.Parallel()
+
+	clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10))
+	np := fmt.Sprintf("tf-test-cluster-nodepool-%s", acctest.RandString(t, 10))
+	networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster")
+	subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName)
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckContainerClusterDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccContainerNodePool_withFlexStart(clusterName, np, networkName, subnetworkName),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("google_container_node_pool.np", "node_config.0.machine_type", "n1-standard-1"),
+					resource.TestCheckResourceAttr("google_container_node_pool.np",
+						"node_config.0.reservation_affinity.0.consume_reservation_type", "NO_RESERVATION"),
+					resource.TestCheckResourceAttr("google_container_node_pool.np", "node_config.0.flex_start", "true"),
+				),
+			},
+			{
+				ResourceName:            "google_container_node_pool.np",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"node_config.0.taint"},
+			},
+		},
+	})
+}
+
+func testAccContainerNodePool_withFlexStart(clusterName, np, networkName, subnetworkName string) string {
+	return fmt.Sprintf(`
+resource "google_container_cluster" "cluster" {
+  min_master_version = "1.32.3-gke.1717000"
+  
+  name                = "%s"
+  location            = "us-central1-a"
+  initial_node_count  = 1
+  deletion_protection = false
+  network             = "%s"
+  subnetwork          = "%s"
+}
+
+resource "google_container_node_pool" "np" {
+  name               = "%s"
+  location           = "us-central1-a"
+  cluster            = google_container_cluster.cluster.name
+  initial_node_count = 0
+  autoscaling {
+    total_min_node_count = 0
+    total_max_node_count = 1
+  }
+
+  node_config {
+   	machine_type = "n1-standard-1"
+	flex_start = true
+	max_run_duration = "604800s"
+
+	reservation_affinity {
+      consume_reservation_type = "NO_RESERVATION"
+    }
+	
+	taint {
+	  key    = "taint_key"
+	  value  = "taint_value"
+	  effect = "NO_SCHEDULE"
+	}
+  }
+}
+`, clusterName, networkName, subnetworkName, np)
+}
+
 func TestAccContainerNodePool_tpuTopology(t *testing.T) {
 	t.Parallel()
 	t.Skip("https://github.com/hashicorp/terraform-provider-google/issues/15254#issuecomment-1646277473")

website/docs/r/container_cluster.html.markdown

@@ -931,6 +931,8 @@ gvnic {
 
 * `max_run_duration` - (Optional) The runtime of each node in the node pool in seconds, terminated by 's'. Example: "3600s".
 
+* `flex_start` - (Optional) Enables Flex Start provisioning model for the node pool.
+
 * `local_ssd_count` - (Optional) The amount of local SSD disks that will be
     attached to each cluster node. Defaults to 0.