feat: add support for max_run_duration (#2374)

DrFaust92 · web-flow · commit d80316b964a8 · 2025-07-01T15:05:50.000-07:00
Signed-off-by: drfaust92 &lt;ilia.lazebnik@gmail.com&gt;
diff --git a/README.md b/README.md
@@ -396,6 +396,7 @@ The node_pools variable takes the following parameters:
 | reservation_affinity_key | The label key of a reservation resource. To target a SPECIFIC_RESERVATION by name, specify "compute.googleapis.com/reservation-name" as the key and specify the name of your reservation as its value. | | Optional |
 | 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 |
 
 ## windows_node_pools variable
 
diff --git a/autogen/main/README.md b/autogen/main/README.md
@@ -283,6 +283,7 @@ The node_pools variable takes the following parameters:
 | reservation_affinity_key | The label key of a reservation resource. To target a SPECIFIC_RESERVATION by name, specify "compute.googleapis.com/reservation-name" as the key and specify the name of your reservation as its value. | | Optional |
 | 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 |
 
 ## windows_node_pools variable
 
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -675,6 +675,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)
     }
   }
   {% endif %}
@@ -833,6 +834,7 @@ locals {
     "reservation_affinity_values",
     "secondary_boot_disk",
     "local_ssd_encryption_mode",
+    "max_run_duration",
   ]
 }
 
@@ -1265,6 +1267,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)
   }
 
   lifecycle {
diff --git a/cluster.tf b/cluster.tf
@@ -525,6 +525,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)
     }
   }
 
@@ -952,6 +953,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)
   }
 
   lifecycle {
@@ -1273,6 +1275,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)
   }
 
   lifecycle {
diff --git a/modules/beta-private-cluster-update-variant/README.md b/modules/beta-private-cluster-update-variant/README.md
@@ -450,6 +450,7 @@ The node_pools variable takes the following parameters:
 | reservation_affinity_key | The label key of a reservation resource. To target a SPECIFIC_RESERVATION by name, specify "compute.googleapis.com/reservation-name" as the key and specify the name of your reservation as its value. | | Optional |
 | 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 |
 
 ## windows_node_pools variable
 
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -570,6 +570,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)
     }
   }
 
@@ -712,6 +713,7 @@ locals {
     "reservation_affinity_values",
     "secondary_boot_disk",
     "local_ssd_encryption_mode",
+    "max_run_duration",
   ]
 }
 
@@ -1115,6 +1117,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)
   }
 
   lifecycle {
@@ -1450,6 +1453,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)
   }
 
   lifecycle {
diff --git a/modules/beta-private-cluster/README.md b/modules/beta-private-cluster/README.md
@@ -428,6 +428,7 @@ The node_pools variable takes the following parameters:
 | reservation_affinity_key | The label key of a reservation resource. To target a SPECIFIC_RESERVATION by name, specify "compute.googleapis.com/reservation-name" as the key and specify the name of your reservation as its value. | | Optional |
 | 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 |
 
 ## windows_node_pools variable
 
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -570,6 +570,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)
     }
   }
 
@@ -1033,6 +1034,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)
   }
 
   lifecycle {
@@ -1367,6 +1369,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)
   }
 
   lifecycle {
diff --git a/modules/beta-public-cluster-update-variant/README.md b/modules/beta-public-cluster-update-variant/README.md
@@ -437,6 +437,7 @@ The node_pools variable takes the following parameters:
 | reservation_affinity_key | The label key of a reservation resource. To target a SPECIFIC_RESERVATION by name, specify "compute.googleapis.com/reservation-name" as the key and specify the name of your reservation as its value. | | Optional |
 | 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 |
 
 ## windows_node_pools variable
 
diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -570,6 +570,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)
     }
   }
 
@@ -690,6 +691,7 @@ locals {
     "reservation_affinity_values",
     "secondary_boot_disk",
     "local_ssd_encryption_mode",
+    "max_run_duration",
   ]
 }
 
@@ -1093,6 +1095,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)
   }
 
   lifecycle {
@@ -1428,6 +1431,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)
   }
 
   lifecycle {
diff --git a/modules/beta-public-cluster/README.md b/modules/beta-public-cluster/README.md
@@ -415,6 +415,7 @@ The node_pools variable takes the following parameters:
 | reservation_affinity_key | The label key of a reservation resource. To target a SPECIFIC_RESERVATION by name, specify "compute.googleapis.com/reservation-name" as the key and specify the name of your reservation as its value. | | Optional |
 | 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 |
 
 ## windows_node_pools variable
 
diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -570,6 +570,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)
     }
   }
 
@@ -1011,6 +1012,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)
   }
 
   lifecycle {
@@ -1345,6 +1347,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)
   }
 
   lifecycle {
diff --git a/modules/private-cluster-update-variant/README.md b/modules/private-cluster-update-variant/README.md
@@ -431,6 +431,7 @@ The node_pools variable takes the following parameters:
 | reservation_affinity_key | The label key of a reservation resource. To target a SPECIFIC_RESERVATION by name, specify "compute.googleapis.com/reservation-name" as the key and specify the name of your reservation as its value. | | Optional |
 | 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 |
 
 ## windows_node_pools variable
 
diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -525,6 +525,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)
     }
   }
 
@@ -665,6 +666,7 @@ locals {
     "reservation_affinity_values",
     "secondary_boot_disk",
     "local_ssd_encryption_mode",
+    "max_run_duration",
   ]
 }
 
@@ -1055,6 +1057,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)
   }
 
   lifecycle {
@@ -1377,6 +1380,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)
   }
 
   lifecycle {
diff --git a/modules/private-cluster/README.md b/modules/private-cluster/README.md
@@ -409,6 +409,7 @@ The node_pools variable takes the following parameters:
 | reservation_affinity_key | The label key of a reservation resource. To target a SPECIFIC_RESERVATION by name, specify "compute.googleapis.com/reservation-name" as the key and specify the name of your reservation as its value. | | Optional |
 | 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 |
 
 ## windows_node_pools variable
 
diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -525,6 +525,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)
     }
   }
 
@@ -974,6 +975,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)
   }
 
   lifecycle {
@@ -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)
   }
 
   lifecycle {

Original file line number	Diff line number	Diff line change
`@@ -675,6 +675,7 @@ resource "google_container_cluster" "primary" {`
`675`	`675`	`}`
`676`	`676`
`677`	`677`	`local_ssd_encryption_mode = lookup(var.node_pools[0], "local_ssd_encryption_mode", null)`
	`678`	`+ max_run_duration = lookup(var.node_pools[0], "max_run_duration", null)`
`678`	`679`	`}`
`679`	`680`	`}`
`680`	`681`	`{% endif %}`
`@@ -833,6 +834,7 @@ locals {`
`833`	`834`	`"reservation_affinity_values",`
`834`	`835`	`"secondary_boot_disk",`
`835`	`836`	`"local_ssd_encryption_mode",`
	`837`	`+ "max_run_duration",`
`836`	`838`	`]`
`837`	`839`	`}`
`838`	`840`
`@@ -1265,6 +1267,7 @@ resource "google_container_node_pool" "windows_pools" {`
`1265`	`1267`	`}`
`1266`	`1268`
`1267`	`1269`	`local_ssd_encryption_mode = lookup(each.value, "local_ssd_encryption_mode", null)`
	`1270`	`+ max_run_duration = lookup(each.value, "max_run_duration", null)`
`1268`	`1271`	`}`
`1269`	`1272`
`1270`	`1273`	`lifecycle {`
Original file line number	Diff line number	Diff line change
`@@ -525,6 +525,7 @@ resource "google_container_cluster" "primary" {`
`525`	`525`	`}`
`526`	`526`
`527`	`527`	`local_ssd_encryption_mode = lookup(var.node_pools[0], "local_ssd_encryption_mode", null)`
	`528`	`+ max_run_duration = lookup(var.node_pools[0], "max_run_duration", null)`
`528`	`529`	`}`
`529`	`530`	`}`
`530`	`531`
`@@ -952,6 +953,7 @@ resource "google_container_node_pool" "pools" {`
`952`	`953`	`}`
`953`	`954`
`954`	`955`	`local_ssd_encryption_mode = lookup(each.value, "local_ssd_encryption_mode", null)`
	`956`	`+ max_run_duration = lookup(each.value, "max_run_duration", null)`
`955`	`957`	`}`
`956`	`958`
`957`	`959`	`lifecycle {`
`@@ -1273,6 +1275,7 @@ resource "google_container_node_pool" "windows_pools" {`
`1273`	`1275`	`}`
`1274`	`1276`
`1275`	`1277`	`local_ssd_encryption_mode = lookup(each.value, "local_ssd_encryption_mode", null)`
	`1278`	`+ max_run_duration = lookup(each.value, "max_run_duration", null)`
`1276`	`1279`	`}`
`1277`	`1280`
`1278`	`1281`	`lifecycle {`
Original file line number	Diff line number	Diff line change
`@@ -570,6 +570,7 @@ resource "google_container_cluster" "primary" {`
`570`	`570`	`}`
`571`	`571`
`572`	`572`	`local_ssd_encryption_mode = lookup(var.node_pools[0], "local_ssd_encryption_mode", null)`
	`573`	`+ max_run_duration = lookup(var.node_pools[0], "max_run_duration", null)`
`573`	`574`	`}`
`574`	`575`	`}`
`575`	`576`
`@@ -712,6 +713,7 @@ locals {`
`712`	`713`	`"reservation_affinity_values",`
`713`	`714`	`"secondary_boot_disk",`
`714`	`715`	`"local_ssd_encryption_mode",`
	`716`	`+ "max_run_duration",`
`715`	`717`	`]`
`716`	`718`	`}`
`717`	`719`
`@@ -1115,6 +1117,7 @@ resource "google_container_node_pool" "pools" {`
`1115`	`1117`	`}`
`1116`	`1118`
`1117`	`1119`	`local_ssd_encryption_mode = lookup(each.value, "local_ssd_encryption_mode", null)`
	`1120`	`+ max_run_duration = lookup(each.value, "max_run_duration", null)`
`1118`	`1121`	`}`
`1119`	`1122`
`1120`	`1123`	`lifecycle {`
`@@ -1450,6 +1453,7 @@ resource "google_container_node_pool" "windows_pools" {`
`1450`	`1453`	`}`
`1451`	`1454`
`1452`	`1455`	`local_ssd_encryption_mode = lookup(each.value, "local_ssd_encryption_mode", null)`
	`1456`	`+ max_run_duration = lookup(each.value, "max_run_duration", null)`
`1453`	`1457`	`}`
`1454`	`1458`
`1455`	`1459`	`lifecycle {`