Merge branch 'main' into gke-patch

apeabody · web-flow · commit 21712e32bdba · 2025-08-08T10:54:17.000-07:00
diff --git a/README.md b/README.md
@@ -401,6 +401,7 @@ The node_pools variable takes the following parameters:
 | reservation_affinity_values | The list of label values of reservation resources. For example: the name of the specific reservation when using a key of "compute.googleapis.com/reservation-name". This should be passed as comma separated string. | | Optional |
 | local_ssd_encryption_mode | specifies the method used for encrypting the local SSDs attached to the node. Valid values are: "STANDARD_ENCRYPTION" and "EPHEMERAL_KEY_ENCRYPTION" | | Optional |
 | max_run_duration | The runtime of each node in the node pool in seconds, terminated by 's'. Example: "3600s". | null | Optional |
+| flex_start | Enables Flex Start provisioning model for the node pool | null | Optional |
 
 ## windows_node_pools variable
 
diff --git a/autogen/main/README.md b/autogen/main/README.md
@@ -285,6 +285,7 @@ The node_pools variable takes the following parameters:
 | reservation_affinity_values | The list of label values of reservation resources. For example: the name of the specific reservation when using a key of "compute.googleapis.com/reservation-name". This should be passed as comma separated string. | | Optional |
 | local_ssd_encryption_mode | specifies the method used for encrypting the local SSDs attached to the node. Valid values are: "STANDARD_ENCRYPTION" and "EPHEMERAL_KEY_ENCRYPTION" | | Optional |
 | max_run_duration | The runtime of each node in the node pool in seconds, terminated by 's'. Example: "3600s". | null | Optional |
+| flex_start | Enables Flex Start provisioning model for the node pool | null | Optional |
 
 ## windows_node_pools variable
 
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -686,6 +686,7 @@ resource "google_container_cluster" "primary" {
 
       local_ssd_encryption_mode = lookup(var.node_pools[0], "local_ssd_encryption_mode", null)
       max_run_duration          = lookup(var.node_pools[0], "max_run_duration", null)
+      flex_start                = lookup(var.node_pools[0], "flex_start", null)
     }
   }
   {% endif %}
@@ -854,6 +855,7 @@ locals {
     "secondary_boot_disk",
     "local_ssd_encryption_mode",
     "max_run_duration",
+    "flex_start",
   ]
 }
 
@@ -1296,6 +1298,7 @@ resource "google_container_node_pool" "windows_pools" {
 
     local_ssd_encryption_mode = lookup(each.value, "local_ssd_encryption_mode", null)
     max_run_duration          = lookup(each.value, "max_run_duration", null)
+    flex_start                = lookup(each.value, "flex_start", null)
   }
 
   lifecycle {
diff --git a/cluster.tf b/cluster.tf
@@ -537,6 +537,7 @@ resource "google_container_cluster" "primary" {
 
       local_ssd_encryption_mode = lookup(var.node_pools[0], "local_ssd_encryption_mode", null)
       max_run_duration          = lookup(var.node_pools[0], "max_run_duration", null)
+      flex_start                = lookup(var.node_pools[0], "flex_start", null)
     }
   }
 
@@ -983,6 +984,7 @@ resource "google_container_node_pool" "pools" {
 
     local_ssd_encryption_mode = lookup(each.value, "local_ssd_encryption_mode", null)
     max_run_duration          = lookup(each.value, "max_run_duration", null)
+    flex_start                = lookup(each.value, "flex_start", null)
   }
 
   lifecycle {
@@ -1314,6 +1316,7 @@ resource "google_container_node_pool" "windows_pools" {
 
     local_ssd_encryption_mode = lookup(each.value, "local_ssd_encryption_mode", null)
     max_run_duration          = lookup(each.value, "max_run_duration", null)
+    flex_start                = lookup(each.value, "flex_start", null)
   }
 
   lifecycle {
diff --git a/modules/beta-private-cluster-update-variant/README.md b/modules/beta-private-cluster-update-variant/README.md
@@ -455,6 +455,7 @@ The node_pools variable takes the following parameters:
 | reservation_affinity_values | The list of label values of reservation resources. For example: the name of the specific reservation when using a key of "compute.googleapis.com/reservation-name". This should be passed as comma separated string. | | Optional |
 | local_ssd_encryption_mode | specifies the method used for encrypting the local SSDs attached to the node. Valid values are: "STANDARD_ENCRYPTION" and "EPHEMERAL_KEY_ENCRYPTION" | | Optional |
 | max_run_duration | The runtime of each node in the node pool in seconds, terminated by 's'. Example: "3600s". | null | Optional |
+| flex_start | Enables Flex Start provisioning model for the node pool | null | Optional |
 
 ## windows_node_pools variable
 
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -581,6 +581,7 @@ resource "google_container_cluster" "primary" {
 
       local_ssd_encryption_mode = lookup(var.node_pools[0], "local_ssd_encryption_mode", null)
       max_run_duration          = lookup(var.node_pools[0], "max_run_duration", null)
+      flex_start                = lookup(var.node_pools[0], "flex_start", null)
     }
   }
 
@@ -733,6 +734,7 @@ locals {
     "secondary_boot_disk",
     "local_ssd_encryption_mode",
     "max_run_duration",
+    "flex_start",
   ]
 }
 
@@ -1146,6 +1148,7 @@ resource "google_container_node_pool" "pools" {
 
     local_ssd_encryption_mode = lookup(each.value, "local_ssd_encryption_mode", null)
     max_run_duration          = lookup(each.value, "max_run_duration", null)
+    flex_start                = lookup(each.value, "flex_start", null)
   }
 
   lifecycle {
@@ -1491,6 +1494,7 @@ resource "google_container_node_pool" "windows_pools" {
 
     local_ssd_encryption_mode = lookup(each.value, "local_ssd_encryption_mode", null)
     max_run_duration          = lookup(each.value, "max_run_duration", null)
+    flex_start                = lookup(each.value, "flex_start", null)
   }
 
   lifecycle {
diff --git a/modules/beta-private-cluster/README.md b/modules/beta-private-cluster/README.md
@@ -433,6 +433,7 @@ The node_pools variable takes the following parameters:
 | reservation_affinity_values | The list of label values of reservation resources. For example: the name of the specific reservation when using a key of "compute.googleapis.com/reservation-name". This should be passed as comma separated string. | | Optional |
 | local_ssd_encryption_mode | specifies the method used for encrypting the local SSDs attached to the node. Valid values are: "STANDARD_ENCRYPTION" and "EPHEMERAL_KEY_ENCRYPTION" | | Optional |
 | max_run_duration | The runtime of each node in the node pool in seconds, terminated by 's'. Example: "3600s". | null | Optional |
+| flex_start | Enables Flex Start provisioning model for the node pool | null | Optional |
 
 ## windows_node_pools variable
 
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -581,6 +581,7 @@ resource "google_container_cluster" "primary" {
 
       local_ssd_encryption_mode = lookup(var.node_pools[0], "local_ssd_encryption_mode", null)
       max_run_duration          = lookup(var.node_pools[0], "max_run_duration", null)
+      flex_start                = lookup(var.node_pools[0], "flex_start", null)
     }
   }
 
@@ -1063,6 +1064,7 @@ resource "google_container_node_pool" "pools" {
 
     local_ssd_encryption_mode = lookup(each.value, "local_ssd_encryption_mode", null)
     max_run_duration          = lookup(each.value, "max_run_duration", null)
+    flex_start                = lookup(each.value, "flex_start", null)
   }
 
   lifecycle {
@@ -1407,6 +1409,7 @@ resource "google_container_node_pool" "windows_pools" {
 
     local_ssd_encryption_mode = lookup(each.value, "local_ssd_encryption_mode", null)
     max_run_duration          = lookup(each.value, "max_run_duration", null)
+    flex_start                = lookup(each.value, "flex_start", null)
   }
 
   lifecycle {
diff --git a/modules/beta-public-cluster-update-variant/README.md b/modules/beta-public-cluster-update-variant/README.md
@@ -442,6 +442,7 @@ The node_pools variable takes the following parameters:
 | reservation_affinity_values | The list of label values of reservation resources. For example: the name of the specific reservation when using a key of "compute.googleapis.com/reservation-name". This should be passed as comma separated string. | | Optional |
 | local_ssd_encryption_mode | specifies the method used for encrypting the local SSDs attached to the node. Valid values are: "STANDARD_ENCRYPTION" and "EPHEMERAL_KEY_ENCRYPTION" | | Optional |
 | max_run_duration | The runtime of each node in the node pool in seconds, terminated by 's'. Example: "3600s". | null | Optional |
+| flex_start | Enables Flex Start provisioning model for the node pool | null | Optional |
 
 ## windows_node_pools variable
 
diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -581,6 +581,7 @@ resource "google_container_cluster" "primary" {
 
       local_ssd_encryption_mode = lookup(var.node_pools[0], "local_ssd_encryption_mode", null)
       max_run_duration          = lookup(var.node_pools[0], "max_run_duration", null)
+      flex_start                = lookup(var.node_pools[0], "flex_start", null)
     }
   }
 
@@ -711,6 +712,7 @@ locals {
     "secondary_boot_disk",
     "local_ssd_encryption_mode",
     "max_run_duration",
+    "flex_start",
   ]
 }
 
@@ -1124,6 +1126,7 @@ resource "google_container_node_pool" "pools" {
 
     local_ssd_encryption_mode = lookup(each.value, "local_ssd_encryption_mode", null)
     max_run_duration          = lookup(each.value, "max_run_duration", null)
+    flex_start                = lookup(each.value, "flex_start", null)
   }
 
   lifecycle {
@@ -1469,6 +1472,7 @@ resource "google_container_node_pool" "windows_pools" {
 
     local_ssd_encryption_mode = lookup(each.value, "local_ssd_encryption_mode", null)
     max_run_duration          = lookup(each.value, "max_run_duration", null)
+    flex_start                = lookup(each.value, "flex_start", null)
   }
 
   lifecycle {
diff --git a/modules/beta-public-cluster/README.md b/modules/beta-public-cluster/README.md
@@ -420,6 +420,7 @@ The node_pools variable takes the following parameters:
 | reservation_affinity_values | The list of label values of reservation resources. For example: the name of the specific reservation when using a key of "compute.googleapis.com/reservation-name". This should be passed as comma separated string. | | Optional |
 | local_ssd_encryption_mode | specifies the method used for encrypting the local SSDs attached to the node. Valid values are: "STANDARD_ENCRYPTION" and "EPHEMERAL_KEY_ENCRYPTION" | | Optional |
 | max_run_duration | The runtime of each node in the node pool in seconds, terminated by 's'. Example: "3600s". | null | Optional |
+| flex_start | Enables Flex Start provisioning model for the node pool | null | Optional |
 
 ## windows_node_pools variable
 
diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -581,6 +581,7 @@ resource "google_container_cluster" "primary" {
 
       local_ssd_encryption_mode = lookup(var.node_pools[0], "local_ssd_encryption_mode", null)
       max_run_duration          = lookup(var.node_pools[0], "max_run_duration", null)
+      flex_start                = lookup(var.node_pools[0], "flex_start", null)
     }
   }
 
@@ -1041,6 +1042,7 @@ resource "google_container_node_pool" "pools" {
 
     local_ssd_encryption_mode = lookup(each.value, "local_ssd_encryption_mode", null)
     max_run_duration          = lookup(each.value, "max_run_duration", null)
+    flex_start                = lookup(each.value, "flex_start", null)
   }
 
   lifecycle {
@@ -1385,6 +1387,7 @@ resource "google_container_node_pool" "windows_pools" {
 
     local_ssd_encryption_mode = lookup(each.value, "local_ssd_encryption_mode", null)
     max_run_duration          = lookup(each.value, "max_run_duration", null)
+    flex_start                = lookup(each.value, "flex_start", null)
   }
 
   lifecycle {
diff --git a/modules/private-cluster-update-variant/README.md b/modules/private-cluster-update-variant/README.md
@@ -436,6 +436,7 @@ The node_pools variable takes the following parameters:
 | reservation_affinity_values | The list of label values of reservation resources. For example: the name of the specific reservation when using a key of "compute.googleapis.com/reservation-name". This should be passed as comma separated string. | | Optional |
 | local_ssd_encryption_mode | specifies the method used for encrypting the local SSDs attached to the node. Valid values are: "STANDARD_ENCRYPTION" and "EPHEMERAL_KEY_ENCRYPTION" | | Optional |
 | max_run_duration | The runtime of each node in the node pool in seconds, terminated by 's'. Example: "3600s". | null | Optional |
+| flex_start | Enables Flex Start provisioning model for the node pool | null | Optional |
 
 ## windows_node_pools variable
 
diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -537,6 +537,7 @@ resource "google_container_cluster" "primary" {
 
       local_ssd_encryption_mode = lookup(var.node_pools[0], "local_ssd_encryption_mode", null)
       max_run_duration          = lookup(var.node_pools[0], "max_run_duration", null)
+      flex_start                = lookup(var.node_pools[0], "flex_start", null)
     }
   }
 
@@ -687,6 +688,7 @@ locals {
     "secondary_boot_disk",
     "local_ssd_encryption_mode",
     "max_run_duration",
+    "flex_start",
   ]
 }
 
@@ -1087,6 +1089,7 @@ resource "google_container_node_pool" "pools" {
 
     local_ssd_encryption_mode = lookup(each.value, "local_ssd_encryption_mode", null)
     max_run_duration          = lookup(each.value, "max_run_duration", null)
+    flex_start                = lookup(each.value, "flex_start", null)
   }
 
   lifecycle {
@@ -1419,6 +1422,7 @@ resource "google_container_node_pool" "windows_pools" {
 
     local_ssd_encryption_mode = lookup(each.value, "local_ssd_encryption_mode", null)
     max_run_duration          = lookup(each.value, "max_run_duration", null)
+    flex_start                = lookup(each.value, "flex_start", null)
   }
 
   lifecycle {
diff --git a/modules/private-cluster/README.md b/modules/private-cluster/README.md
@@ -414,6 +414,7 @@ The node_pools variable takes the following parameters:
 | reservation_affinity_values | The list of label values of reservation resources. For example: the name of the specific reservation when using a key of "compute.googleapis.com/reservation-name". This should be passed as comma separated string. | | Optional |
 | local_ssd_encryption_mode | specifies the method used for encrypting the local SSDs attached to the node. Valid values are: "STANDARD_ENCRYPTION" and "EPHEMERAL_KEY_ENCRYPTION" | | Optional |
 | max_run_duration | The runtime of each node in the node pool in seconds, terminated by 's'. Example: "3600s". | null | Optional |
+| flex_start | Enables Flex Start provisioning model for the node pool | null | Optional |
 
 ## windows_node_pools variable
 
diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -537,6 +537,7 @@ resource "google_container_cluster" "primary" {
 
       local_ssd_encryption_mode = lookup(var.node_pools[0], "local_ssd_encryption_mode", null)
       max_run_duration          = lookup(var.node_pools[0], "max_run_duration", null)
+      flex_start                = lookup(var.node_pools[0], "flex_start", null)
     }
   }
 
@@ -1005,6 +1006,7 @@ resource "google_container_node_pool" "pools" {
 
     local_ssd_encryption_mode = lookup(each.value, "local_ssd_encryption_mode", null)
     max_run_duration          = lookup(each.value, "max_run_duration", null)
+    flex_start                = lookup(each.value, "flex_start", null)
   }
 
   lifecycle {
@@ -1336,6 +1338,7 @@ resource "google_container_node_pool" "windows_pools" {
 
     local_ssd_encryption_mode = lookup(each.value, "local_ssd_encryption_mode", null)
     max_run_duration          = lookup(each.value, "max_run_duration", null)
+    flex_start                = lookup(each.value, "flex_start", null)
   }
 
   lifecycle {

Original file line number	Diff line number	Diff line change
`@@ -686,6 +686,7 @@ resource "google_container_cluster" "primary" {`
`686`	`686`
`687`	`687`	`local_ssd_encryption_mode = lookup(var.node_pools[0], "local_ssd_encryption_mode", null)`
`688`	`688`	`max_run_duration = lookup(var.node_pools[0], "max_run_duration", null)`
	`689`	`+ flex_start = lookup(var.node_pools[0], "flex_start", null)`
`689`	`690`	`}`
`690`	`691`	`}`
`691`	`692`	`{% endif %}`
`@@ -854,6 +855,7 @@ locals {`
`854`	`855`	`"secondary_boot_disk",`
`855`	`856`	`"local_ssd_encryption_mode",`
`856`	`857`	`"max_run_duration",`
	`858`	`+ "flex_start",`
`857`	`859`	`]`
`858`	`860`	`}`
`859`	`861`
`@@ -1296,6 +1298,7 @@ resource "google_container_node_pool" "windows_pools" {`
`1296`	`1298`
`1297`	`1299`	`local_ssd_encryption_mode = lookup(each.value, "local_ssd_encryption_mode", null)`
`1298`	`1300`	`max_run_duration = lookup(each.value, "max_run_duration", null)`
	`1301`	`+ flex_start = lookup(each.value, "flex_start", null)`
`1299`	`1302`	`}`
`1300`	`1303`
`1301`	`1304`	`lifecycle {`
Original file line number	Diff line number	Diff line change
`@@ -537,6 +537,7 @@ resource "google_container_cluster" "primary" {`
`537`	`537`
`538`	`538`	`local_ssd_encryption_mode = lookup(var.node_pools[0], "local_ssd_encryption_mode", null)`
`539`	`539`	`max_run_duration = lookup(var.node_pools[0], "max_run_duration", null)`
	`540`	`+ flex_start = lookup(var.node_pools[0], "flex_start", null)`
`540`	`541`	`}`
`541`	`542`	`}`
`542`	`543`
`@@ -983,6 +984,7 @@ resource "google_container_node_pool" "pools" {`
`983`	`984`
`984`	`985`	`local_ssd_encryption_mode = lookup(each.value, "local_ssd_encryption_mode", null)`
`985`	`986`	`max_run_duration = lookup(each.value, "max_run_duration", null)`
	`987`	`+ flex_start = lookup(each.value, "flex_start", null)`
`986`	`988`	`}`
`987`	`989`
`988`	`990`	`lifecycle {`
`@@ -1314,6 +1316,7 @@ resource "google_container_node_pool" "windows_pools" {`
`1314`	`1316`
`1315`	`1317`	`local_ssd_encryption_mode = lookup(each.value, "local_ssd_encryption_mode", null)`
`1316`	`1318`	`max_run_duration = lookup(each.value, "max_run_duration", null)`
	`1319`	`+ flex_start = lookup(each.value, "flex_start", null)`
`1317`	`1320`	`}`
`1318`	`1321`
`1319`	`1322`	`lifecycle {`
Original file line number	Diff line number	Diff line change
`@@ -581,6 +581,7 @@ resource "google_container_cluster" "primary" {`
`581`	`581`
`582`	`582`	`local_ssd_encryption_mode = lookup(var.node_pools[0], "local_ssd_encryption_mode", null)`
`583`	`583`	`max_run_duration = lookup(var.node_pools[0], "max_run_duration", null)`
	`584`	`+ flex_start = lookup(var.node_pools[0], "flex_start", null)`
`584`	`585`	`}`
`585`	`586`	`}`
`586`	`587`
`@@ -733,6 +734,7 @@ locals {`
`733`	`734`	`"secondary_boot_disk",`
`734`	`735`	`"local_ssd_encryption_mode",`
`735`	`736`	`"max_run_duration",`
	`737`	`+ "flex_start",`
`736`	`738`	`]`
`737`	`739`	`}`
`738`	`740`
`@@ -1146,6 +1148,7 @@ resource "google_container_node_pool" "pools" {`
`1146`	`1148`
`1147`	`1149`	`local_ssd_encryption_mode = lookup(each.value, "local_ssd_encryption_mode", null)`
`1148`	`1150`	`max_run_duration = lookup(each.value, "max_run_duration", null)`
	`1151`	`+ flex_start = lookup(each.value, "flex_start", null)`
`1149`	`1152`	`}`
`1150`	`1153`
`1151`	`1154`	`lifecycle {`
`@@ -1491,6 +1494,7 @@ resource "google_container_node_pool" "windows_pools" {`
`1491`	`1494`
`1492`	`1495`	`local_ssd_encryption_mode = lookup(each.value, "local_ssd_encryption_mode", null)`
`1493`	`1496`	`max_run_duration = lookup(each.value, "max_run_duration", null)`
	`1497`	`+ flex_start = lookup(each.value, "flex_start", null)`
`1494`	`1498`	`}`
`1495`	`1499`
`1496`	`1500`	`lifecycle {`