Merge branch 'master' into wyardley/issues/2013

apeabody · web-flow · commit 4d72727cb383 · 2024-10-15T15:27:47.000-07:00
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -707,6 +707,9 @@ locals {
     "enable_secure_boot",
     "enable_integrity_monitoring",
     "local_ssd_count",
+    {% if beta_cluster %}
+    "local_ssd_ephemeral_count",
+    {% endif %}
     "machine_type",
     "placement_policy",
     "max_pods_per_node",
@@ -724,6 +727,7 @@ locals {
     "reservation_affinity_key",
     "reservation_affinity_values",
     "enable_confidential_nodes",
+    "secondary_boot_disk",
   ]
 }
 
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -603,6 +603,7 @@ locals {
     "enable_secure_boot",
     "enable_integrity_monitoring",
     "local_ssd_count",
+    "local_ssd_ephemeral_count",
     "machine_type",
     "placement_policy",
     "max_pods_per_node",
@@ -620,6 +621,7 @@ locals {
     "reservation_affinity_key",
     "reservation_affinity_values",
     "enable_confidential_nodes",
+    "secondary_boot_disk",
   ]
 }
 
diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -582,6 +582,7 @@ locals {
     "enable_secure_boot",
     "enable_integrity_monitoring",
     "local_ssd_count",
+    "local_ssd_ephemeral_count",
     "machine_type",
     "placement_policy",
     "max_pods_per_node",
@@ -599,6 +600,7 @@ locals {
     "reservation_affinity_key",
     "reservation_affinity_values",
     "enable_confidential_nodes",
+    "secondary_boot_disk",
   ]
 }
 
diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -562,6 +562,7 @@ locals {
     "reservation_affinity_key",
     "reservation_affinity_values",
     "enable_confidential_nodes",
+    "secondary_boot_disk",
   ]
 }
 

Original file line number	Diff line number	Diff line change
`@@ -603,6 +603,7 @@ locals {`
`603`	`603`	`"enable_secure_boot",`
`604`	`604`	`"enable_integrity_monitoring",`
`605`	`605`	`"local_ssd_count",`
	`606`	`+ "local_ssd_ephemeral_count",`
`606`	`607`	`"machine_type",`
`607`	`608`	`"placement_policy",`
`608`	`609`	`"max_pods_per_node",`
`@@ -620,6 +621,7 @@ locals {`
`620`	`621`	`"reservation_affinity_key",`
`621`	`622`	`"reservation_affinity_values",`
`622`	`623`	`"enable_confidential_nodes",`
	`624`	`+ "secondary_boot_disk",`
`623`	`625`	`]`
`624`	`626`	`}`
`625`	`627`
Original file line number	Diff line number	Diff line change
`@@ -582,6 +582,7 @@ locals {`
`582`	`582`	`"enable_secure_boot",`
`583`	`583`	`"enable_integrity_monitoring",`
`584`	`584`	`"local_ssd_count",`
	`585`	`+ "local_ssd_ephemeral_count",`
`585`	`586`	`"machine_type",`
`586`	`587`	`"placement_policy",`
`587`	`588`	`"max_pods_per_node",`
`@@ -599,6 +600,7 @@ locals {`
`599`	`600`	`"reservation_affinity_key",`
`600`	`601`	`"reservation_affinity_values",`
`601`	`602`	`"enable_confidential_nodes",`
	`603`	`+ "secondary_boot_disk",`
`602`	`604`	`]`
`603`	`605`	`}`
`604`	`606`
Original file line number	Diff line number	Diff line change
`@@ -562,6 +562,7 @@ locals {`
`562`	`562`	`"reservation_affinity_key",`
`563`	`563`	`"reservation_affinity_values",`
`564`	`564`	`"enable_confidential_nodes",`
	`565`	`+ "secondary_boot_disk",`
`565`	`566`	`]`
`566`	`567`	`}`
`567`	`568`