Merge branch 'master' into juliodiez-patch-2
This commit is contained in:
commit
d2def7c2b1
|
@ -41,12 +41,12 @@ resource "google_gke_hub_membership" "default" {
|
||||||
membership_id = each.key
|
membership_id = each.key
|
||||||
endpoint {
|
endpoint {
|
||||||
gke_cluster {
|
gke_cluster {
|
||||||
resource_link = each.value
|
resource_link = "//container.googleapis.com/${each.value}"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
dynamic "authority" {
|
dynamic "authority" {
|
||||||
for_each = (
|
for_each = (
|
||||||
contains(var.workload_identity_clusters, each.key) ? {} : { 1 = 1 }
|
contains(var.workload_identity_clusters, each.key) ? { 1 = 1 } : {}
|
||||||
)
|
)
|
||||||
content {
|
content {
|
||||||
issuer = "https://container.googleapis.com/v1/${var.clusters[each.key]}"
|
issuer = "https://container.googleapis.com/v1/${var.clusters[each.key]}"
|
||||||
|
|
|
@ -74,7 +74,7 @@ def test_configmanagement_setup(resources):
|
||||||
membership_key = f'module.hub.google_gke_hub_membership.default["{cluster}"]'
|
membership_key = f'module.hub.google_gke_hub_membership.default["{cluster}"]'
|
||||||
membership = resources[membership_key]
|
membership = resources[membership_key]
|
||||||
link = membership['endpoint'][0]['gke_cluster'][0]['resource_link']
|
link = membership['endpoint'][0]['gke_cluster'][0]['resource_link']
|
||||||
assert link == f'projects/myproject/locations/europe-west1-b/clusters/{cluster}'
|
assert link == f'//container.googleapis.com/projects/myproject/locations/europe-west1-b/clusters/{cluster}'
|
||||||
|
|
||||||
fm_key = f'module.hub.google_gke_hub_feature_membership.default["{cluster}"]'
|
fm_key = f'module.hub.google_gke_hub_feature_membership.default["{cluster}"]'
|
||||||
fm = resources[fm_key]
|
fm = resources[fm_key]
|
||||||
|
|
Loading…
Reference in New Issue