Merge branch 'main' into cluster-egress-setting

apeabody · web-flow · commit 8b4d9f782f54 · 2025-08-08T10:54:28.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
@@ -685,6 +685,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 %}
@@ -853,6 +854,7 @@ locals {
     "secondary_boot_disk",
     "local_ssd_encryption_mode",
     "max_run_duration",
+    "flex_start",
   ]
 }
 
@@ -1295,6 +1297,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
@@ -536,6 +536,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)
     }
   }
 
@@ -982,6 +983,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 {
@@ -1313,6 +1315,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
@@ -580,6 +580,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)
     }
   }
 
@@ -732,6 +733,7 @@ locals {
     "secondary_boot_disk",
     "local_ssd_encryption_mode",
     "max_run_duration",
+    "flex_start",
   ]
 }
 
@@ -1145,6 +1147,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 {
@@ -1490,6 +1493,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
@@ -580,6 +580,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)
     }
   }
 
@@ -1062,6 +1063,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 {
@@ -1406,6 +1408,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
@@ -580,6 +580,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)
     }
   }
 
@@ -710,6 +711,7 @@ locals {
     "secondary_boot_disk",
     "local_ssd_encryption_mode",
     "max_run_duration",
+    "flex_start",
   ]
 }
 
@@ -1123,6 +1125,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 {
@@ -1468,6 +1471,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
@@ -580,6 +580,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)
     }
   }
 
@@ -1040,6 +1041,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 {
@@ -1384,6 +1386,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
@@ -536,6 +536,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)
     }
   }
 
@@ -686,6 +687,7 @@ locals {
     "secondary_boot_disk",
     "local_ssd_encryption_mode",
     "max_run_duration",
+    "flex_start",
   ]
 }
 
@@ -1086,6 +1088,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 {
@@ -1418,6 +1421,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
@@ -536,6 +536,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)
     }
   }
 
@@ -1004,6 +1005,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 {
@@ -1335,6 +1337,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
`@@ -685,6 +685,7 @@ resource "google_container_cluster" "primary" {`
`685`	`685`
`686`	`686`	`local_ssd_encryption_mode = lookup(var.node_pools[0], "local_ssd_encryption_mode", null)`
`687`	`687`	`max_run_duration = lookup(var.node_pools[0], "max_run_duration", null)`
	`688`	`+ flex_start = lookup(var.node_pools[0], "flex_start", null)`
`688`	`689`	`}`
`689`	`690`	`}`
`690`	`691`	`{% endif %}`
`@@ -853,6 +854,7 @@ locals {`
`853`	`854`	`"secondary_boot_disk",`
`854`	`855`	`"local_ssd_encryption_mode",`
`855`	`856`	`"max_run_duration",`
	`857`	`+ "flex_start",`
`856`	`858`	`]`
`857`	`859`	`}`
`858`	`860`
`@@ -1295,6 +1297,7 @@ resource "google_container_node_pool" "windows_pools" {`
`1295`	`1297`
`1296`	`1298`	`local_ssd_encryption_mode = lookup(each.value, "local_ssd_encryption_mode", null)`
`1297`	`1299`	`max_run_duration = lookup(each.value, "max_run_duration", null)`
	`1300`	`+ flex_start = lookup(each.value, "flex_start", null)`
`1298`	`1301`	`}`
`1299`	`1302`
`1300`	`1303`	`lifecycle {`
Original file line number	Diff line number	Diff line change
`@@ -536,6 +536,7 @@ resource "google_container_cluster" "primary" {`
`536`	`536`
`537`	`537`	`local_ssd_encryption_mode = lookup(var.node_pools[0], "local_ssd_encryption_mode", null)`
`538`	`538`	`max_run_duration = lookup(var.node_pools[0], "max_run_duration", null)`
	`539`	`+ flex_start = lookup(var.node_pools[0], "flex_start", null)`
`539`	`540`	`}`
`540`	`541`	`}`
`541`	`542`
`@@ -982,6 +983,7 @@ resource "google_container_node_pool" "pools" {`
`982`	`983`
`983`	`984`	`local_ssd_encryption_mode = lookup(each.value, "local_ssd_encryption_mode", null)`
`984`	`985`	`max_run_duration = lookup(each.value, "max_run_duration", null)`
	`986`	`+ flex_start = lookup(each.value, "flex_start", null)`
`985`	`987`	`}`
`986`	`988`
`987`	`989`	`lifecycle {`
`@@ -1313,6 +1315,7 @@ resource "google_container_node_pool" "windows_pools" {`
`1313`	`1315`
`1314`	`1316`	`local_ssd_encryption_mode = lookup(each.value, "local_ssd_encryption_mode", null)`
`1315`	`1317`	`max_run_duration = lookup(each.value, "max_run_duration", null)`
	`1318`	`+ flex_start = lookup(each.value, "flex_start", null)`
`1316`	`1319`	`}`
`1317`	`1320`
`1318`	`1321`	`lifecycle {`
Original file line number	Diff line number	Diff line change
`@@ -580,6 +580,7 @@ resource "google_container_cluster" "primary" {`
`580`	`580`
`581`	`581`	`local_ssd_encryption_mode = lookup(var.node_pools[0], "local_ssd_encryption_mode", null)`
`582`	`582`	`max_run_duration = lookup(var.node_pools[0], "max_run_duration", null)`
	`583`	`+ flex_start = lookup(var.node_pools[0], "flex_start", null)`
`583`	`584`	`}`
`584`	`585`	`}`
`585`	`586`
`@@ -732,6 +733,7 @@ locals {`
`732`	`733`	`"secondary_boot_disk",`
`733`	`734`	`"local_ssd_encryption_mode",`
`734`	`735`	`"max_run_duration",`
	`736`	`+ "flex_start",`
`735`	`737`	`]`
`736`	`738`	`}`
`737`	`739`
`@@ -1145,6 +1147,7 @@ resource "google_container_node_pool" "pools" {`
`1145`	`1147`
`1146`	`1148`	`local_ssd_encryption_mode = lookup(each.value, "local_ssd_encryption_mode", null)`
`1147`	`1149`	`max_run_duration = lookup(each.value, "max_run_duration", null)`
	`1150`	`+ flex_start = lookup(each.value, "flex_start", null)`
`1148`	`1151`	`}`
`1149`	`1152`
`1150`	`1153`	`lifecycle {`
`@@ -1490,6 +1493,7 @@ resource "google_container_node_pool" "windows_pools" {`
`1490`	`1493`
`1491`	`1494`	`local_ssd_encryption_mode = lookup(each.value, "local_ssd_encryption_mode", null)`
`1492`	`1495`	`max_run_duration = lookup(each.value, "max_run_duration", null)`
	`1496`	`+ flex_start = lookup(each.value, "flex_start", null)`
`1493`	`1497`	`}`
`1494`	`1498`
`1495`	`1499`	`lifecycle {`