Merge branch 'master' into feature/nodepool-confidential

apeabody · web-flow · commit 8a3dbd897ef3 · 2024-10-01T10:22:05.000-07:00
diff --git a/modules/acm/feature.tf b/modules/acm/feature.tf
@@ -29,7 +29,7 @@ resource "google_gke_hub_feature_membership" "main" {
     google_gke_hub_feature.acm
   ]
 
-  location = "global"
+  location = module.registration.location
   feature  = "configmanagement"
 
   membership = module.registration.cluster_membership_id

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ resource "google_gke_hub_feature_membership" "main" {`
`29`	`29`	`google_gke_hub_feature.acm`
`30`	`30`	`]`
`31`	`31`
`32`		`- location = "global"`
	`32`	`+ location = module.registration.location`
`33`	`33`	`feature = "configmanagement"`
`34`	`34`
`35`	`35`	`membership = module.registration.cluster_membership_id`