From e3b2c1becfb55f9e9d1037152d171379a5a405c1 Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Thu, 3 Oct 2024 16:32:20 -0700 Subject: [PATCH 1/3] fix(acm): correct membership location --- modules/acm/feature.tf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/acm/feature.tf b/modules/acm/feature.tf index a497cd0713..51b8f92fa8 100644 --- a/modules/acm/feature.tf +++ b/modules/acm/feature.tf @@ -29,11 +29,12 @@ resource "google_gke_hub_feature_membership" "main" { google_gke_hub_feature.acm ] - location = module.registration.location + location = "global" feature = "configmanagement" + project = coalesce(var.fleet_project_id, var.project_id) - membership = module.registration.cluster_membership_id - project = coalesce(var.fleet_project_id, var.project_id) + membership = module.registration.cluster_membership_id + membership_location = module.registration.location configmanagement { version = var.configmanagement_version From 033b3c85be9aaac215736499e00407fd0e0c3db9 Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Thu, 3 Oct 2024 16:32:59 -0700 Subject: [PATCH 2/3] Update feature.tf --- modules/acm/feature.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/acm/feature.tf b/modules/acm/feature.tf index 51b8f92fa8..5211afcabf 100644 --- a/modules/acm/feature.tf +++ b/modules/acm/feature.tf @@ -31,10 +31,10 @@ resource "google_gke_hub_feature_membership" "main" { location = "global" feature = "configmanagement" - project = coalesce(var.fleet_project_id, var.project_id) membership = module.registration.cluster_membership_id membership_location = module.registration.location + project = coalesce(var.fleet_project_id, var.project_id) configmanagement { version = var.configmanagement_version From 1bc6a9d61c919e4e1bfdead972edbade403dcea2 Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Thu, 3 Oct 2024 16:34:13 -0700 Subject: [PATCH 3/3] Update feature.tf --- modules/acm/feature.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/acm/feature.tf b/modules/acm/feature.tf index 5211afcabf..659e77aa0a 100644 --- a/modules/acm/feature.tf +++ b/modules/acm/feature.tf @@ -32,8 +32,8 @@ resource "google_gke_hub_feature_membership" "main" { location = "global" feature = "configmanagement" - membership = module.registration.cluster_membership_id membership_location = module.registration.location + membership = module.registration.cluster_membership_id project = coalesce(var.fleet_project_id, var.project_id) configmanagement {