Merge branch 'main' into ap/retry_incompatible_operation

apeabody · web-flow · commit 9c64296885f5 · 2025-10-13T23:28:44.000-07:00
diff --git a/modules/gke-autopilot-cluster/main.tf b/modules/gke-autopilot-cluster/main.tf
@@ -64,7 +64,7 @@ resource "google_container_cluster" "main" {
   dynamic "cost_management_config" {
     for_each = var.cost_management_config != null ? [var.cost_management_config] : []
     content {
-      enabled = cost_management_config.enabled
+      enabled = cost_management_config.value.enabled
     }
   }
 
diff --git a/modules/gke-standard-cluster/main.tf b/modules/gke-standard-cluster/main.tf
@@ -1121,7 +1121,7 @@ resource "google_container_cluster" "main" {
   dynamic "cost_management_config" {
     for_each = var.cost_management_config != null ? [var.cost_management_config] : []
     content {
-      enabled = cost_management_config.enabled
+      enabled = cost_management_config.value.enabled
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ resource "google_container_cluster" "main" {`
`64`	`64`	`dynamic "cost_management_config" {`
`65`	`65`	`for_each = var.cost_management_config != null ? [var.cost_management_config] : []`
`66`	`66`	`content {`
`67`		`- enabled = cost_management_config.enabled`
	`67`	`+ enabled = cost_management_config.value.enabled`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
Original file line number	Diff line number	Diff line change
`@@ -1121,7 +1121,7 @@ resource "google_container_cluster" "main" {`
`1121`	`1121`	`dynamic "cost_management_config" {`
`1122`	`1122`	`for_each = var.cost_management_config != null ? [var.cost_management_config] : []`
`1123`	`1123`	`content {`
`1124`		`- enabled = cost_management_config.enabled`
	`1124`	`+ enabled = cost_management_config.value.enabled`
`1125`	`1125`	`}`
`1126`	`1126`	`}`
`1127`	`1127`