zecfoundation
/
cloud-foundation-fabric
mirror of https://github.com/ZcashFoundation/cloud-foundation-fabric.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into juliodiez-patch-2

This commit is contained in:
Julio Diez 2023-02-27 22:01:49 +01:00 committed by GitHub
parent 6f499a998c 3776716f1e
commit d2def7c2b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gke-hub/main.tf
View File

@ -41,12 +41,12 @@ resource "google_gke_hub_membership" "default" {
membership_id = each.key
endpoint {
gke_cluster {
resource_link = each.value
resource_link = "//container.googleapis.com/${each.value}"
}
}
dynamic "authority" {
for_each = (
contains(var.workload_identity_clusters, each.key) ? {} : { 1 = 1 }
contains(var.workload_identity_clusters, each.key) ? { 1 = 1 } : {}
)
content {
issuer = "https://container.googleapis.com/v1/${var.clusters[each.key]}"

2
tests/modules/gke_hub/test_plan.py
View File

@ -74,7 +74,7 @@ def test_configmanagement_setup(resources):
membership_key = f'module.hub.google_gke_hub_membership.default["{cluster}"]'
membership = resources[membership_key]
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 = resources[fm_key]