fix: remove default-pool beta gate for boot_disk_kms_key (#2378)

apeabody · web-flow · commit b405ea51073d · 2025-07-07T16:21:09.000-05:00
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -254,7 +254,7 @@ resource "google_container_cluster" "primary" {
   disable_l4_lb_firewall_reconciliation = var.disable_l4_lb_firewall_reconciliation
 
   enable_cilium_clusterwide_network_policy = var.enable_cilium_clusterwide_network_policy
-  
+
   in_transit_encryption_config = var.in_transit_encryption_config
 
   dynamic "secret_manager_config" {
@@ -664,8 +664,8 @@ resource "google_container_cluster" "primary" {
         }
       }
 
-      boot_disk_kms_key = lookup(var.node_pools[0], "boot_disk_kms_key", var.boot_disk_kms_key)
       {% endif %}
+      boot_disk_kms_key = lookup(var.node_pools[0], "boot_disk_kms_key", var.boot_disk_kms_key)
 
       storage_pools = lookup(var.node_pools[0], "storage_pools", null) != null ? [var.node_pools[0].storage_pools] : []
 
@@ -1253,7 +1253,7 @@ resource "google_container_node_pool" "windows_pools" {
           content {
             hugepage_size_2m = try(coalesce(local.node_pools_hugepage_size_2m[each.value["name"]], local.node_pools_hugepage_size_2m["all"]), null)
             hugepage_size_1g = try(coalesce(local.node_pools_hugepage_size_1g[each.value["name"]], local.node_pools_hugepage_size_1g["all"]), null)
-          }  
+          }
         }
       }
     }
diff --git a/cluster.tf b/cluster.tf
@@ -516,6 +516,7 @@ resource "google_container_cluster" "primary" {
 
       metadata = local.node_pools_metadata["all"]
 
+      boot_disk_kms_key = lookup(var.node_pools[0], "boot_disk_kms_key", var.boot_disk_kms_key)
 
       storage_pools = lookup(var.node_pools[0], "storage_pools", null) != null ? [var.node_pools[0].storage_pools] : []
 
diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -516,6 +516,7 @@ resource "google_container_cluster" "primary" {
 
       metadata = local.node_pools_metadata["all"]
 
+      boot_disk_kms_key = lookup(var.node_pools[0], "boot_disk_kms_key", var.boot_disk_kms_key)
 
       storage_pools = lookup(var.node_pools[0], "storage_pools", null) != null ? [var.node_pools[0].storage_pools] : []
 
diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -516,6 +516,7 @@ resource "google_container_cluster" "primary" {
 
       metadata = local.node_pools_metadata["all"]
 
+      boot_disk_kms_key = lookup(var.node_pools[0], "boot_disk_kms_key", var.boot_disk_kms_key)
 
       storage_pools = lookup(var.node_pools[0], "storage_pools", null) != null ? [var.node_pools[0].storage_pools] : []
 

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ resource "google_container_cluster" "primary" {`
`254`	`254`	`disable_l4_lb_firewall_reconciliation = var.disable_l4_lb_firewall_reconciliation`
`255`	`255`
`256`	`256`	`enable_cilium_clusterwide_network_policy = var.enable_cilium_clusterwide_network_policy`
`257`		`-`
	`257`	`+`
`258`	`258`	`in_transit_encryption_config = var.in_transit_encryption_config`
`259`	`259`
`260`	`260`	`dynamic "secret_manager_config" {`
`@@ -664,8 +664,8 @@ resource "google_container_cluster" "primary" {`
`664`	`664`	`}`
`665`	`665`	`}`
`666`	`666`
`667`		`- boot_disk_kms_key = lookup(var.node_pools[0], "boot_disk_kms_key", var.boot_disk_kms_key)`
`668`	`667`	`{% endif %}`
	`668`	`+ boot_disk_kms_key = lookup(var.node_pools[0], "boot_disk_kms_key", var.boot_disk_kms_key)`
`669`	`669`
`670`	`670`	`storage_pools = lookup(var.node_pools[0], "storage_pools", null) != null ? [var.node_pools[0].storage_pools] : []`
`671`	`671`
`@@ -1253,7 +1253,7 @@ resource "google_container_node_pool" "windows_pools" {`
`1253`	`1253`	`content {`
`1254`	`1254`	`hugepage_size_2m = try(coalesce(local.node_pools_hugepage_size_2m[each.value["name"]], local.node_pools_hugepage_size_2m["all"]), null)`
`1255`	`1255`	`hugepage_size_1g = try(coalesce(local.node_pools_hugepage_size_1g[each.value["name"]], local.node_pools_hugepage_size_1g["all"]), null)`
`1256`		`- }`
	`1256`	`+ }`
`1257`	`1257`	`}`
`1258`	`1258`	`}`
`1259`	`1259`	`}`
Original file line number	Diff line number	Diff line change
`@@ -516,6 +516,7 @@ resource "google_container_cluster" "primary" {`
`516`	`516`
`517`	`517`	`metadata = local.node_pools_metadata["all"]`
`518`	`518`
	`519`	`+ boot_disk_kms_key = lookup(var.node_pools[0], "boot_disk_kms_key", var.boot_disk_kms_key)`
`519`	`520`
`520`	`521`	`storage_pools = lookup(var.node_pools[0], "storage_pools", null) != null ? [var.node_pools[0].storage_pools] : []`
`521`	`522`