From 4843d0dfafca4f8a8d65065a52d48b4700d9777f Mon Sep 17 00:00:00 2001 From: Dazbo Date: Tue, 11 Apr 2023 03:47:03 +0100 Subject: [PATCH 1/3] Fixed type in readme for FAST multitenant (#1313) --- fast/stages-multitenant/0-bootstrap-tenant/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fast/stages-multitenant/0-bootstrap-tenant/README.md b/fast/stages-multitenant/0-bootstrap-tenant/README.md index bb7f93ee5..9cecf5f82 100644 --- a/fast/stages-multitenant/0-bootstrap-tenant/README.md +++ b/fast/stages-multitenant/0-bootstrap-tenant/README.md @@ -89,7 +89,7 @@ outputs_location = "~/fast-config" ### Global overrides -The globals variable file linekd above contains definition which were set for the organization, for example the locations used for log sink destinations. These might not be correct for each tenant, so this stage allows overriding them via the tenant configuration variable described in the next section. +The globals variable file linked above contains definition which were set for the organization, for example the locations used for log sink destinations. These might not be correct for each tenant, so this stage allows overriding them via the tenant configuration variable described in the next section. ### Tenant-level configuration From 33e8b42842a3281bb53d39b264ba6a435ba29efb Mon Sep 17 00:00:00 2001 From: Mikhail Filipchuk Date: Tue, 11 Apr 2023 04:06:13 +0100 Subject: [PATCH 2/3] Use labels var in cloud-run module (#1310) Co-authored-by: Ludovico Magnocavallo --- modules/cloud-run/main.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/cloud-run/main.tf b/modules/cloud-run/main.tf index 8ef52be5d..474d05c5f 100644 --- a/modules/cloud-run/main.tf +++ b/modules/cloud-run/main.tf @@ -259,6 +259,7 @@ resource "google_cloud_run_service" "service" { metadata { annotations = local.annotations + labels = var.labels } dynamic "traffic" { From 2cd247bb1fe78ac9f87f4615643618ea39645183 Mon Sep 17 00:00:00 2001 From: Ludovico Magnocavallo Date: Tue, 11 Apr 2023 18:43:39 +0900 Subject: [PATCH 3/3] fix mt resman, add support for mt stage 2s (#1315) --- fast/stage-links.sh | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/fast/stage-links.sh b/fast/stage-links.sh index 52c9e5ae6..4251a01c6 100755 --- a/fast/stage-links.sh +++ b/fast/stage-links.sh @@ -70,18 +70,34 @@ case $STAGE_NAME in exit 1 fi unset GLOBALS - PROVIDER="providers/1-resman-tenant-providers.tf" - TFVARS="tfvars/0-bootstrap-tenant.auto.tfvars.json" + PROVIDER="tenants/$TENANT/providers/1-resman-tenant-providers.tf" + TFVARS="tenants/$TENANT/tfvars/0-bootstrap-tenant.auto.tfvars.json" ;; "2-networking"*) - PROVIDER="providers/2-networking-providers.tf" - TFVARS="tfvars/0-bootstrap.auto.tfvars.json - tfvars/1-resman.auto.tfvars.json" + if [[ -z "$TENANT" ]]; then + echo "# if this is a tenant stage, set a \$TENANT variable with the tenant shortname and run the command again" + PROVIDER="providers/2-networking-providers.tf" + TFVARS="tfvars/0-bootstrap.auto.tfvars.json + tfvars/1-resman.auto.tfvars.json" + else + unset GLOBALS + PROVIDER="tenants/$TENANT/providers/2-networking-providers.tf" + TFVARS="tenants/$TENANT/tfvars/0-bootstrap-tenant.auto.tfvars.json + tenants/$TENANT/tfvars/1-resman.auto.tfvars.json" + fi ;; "2-security"*) - PROVIDER="providers/2-security-providers.tf" - TFVARS="tfvars/0-bootstrap.auto.tfvars.json - tfvars/1-resman.auto.tfvars.json" + if [[ -z "$TENANT" ]]; then + echo "# if this is a tenant stage, set a \$TENANT variable with the tenant shortname and run the command again" + PROVIDER="providers/2-security-providers.tf" + TFVARS="tfvars/0-bootstrap.auto.tfvars.json + tfvars/1-resman.auto.tfvars.json" + else + unset GLOBALS + PROVIDER="tenants/$TENANT/providers/2-security-providers.tf" + TFVARS="tenants/$TENANT/tfvars/0-bootstrap-tenant.auto.tfvars.json + tenants/$TENANT/tfvars/1-resman.auto.tfvars.json" + fi ;; *) # check for a "dev" stage 3