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 'GoogleCloudPlatform:master' into ajln-firewall

This commit is contained in:
Antonio Lopez 2023-04-11 12:24:06 +02:00 committed by GitHub
parent 4ccf9f9361 2cd247bb1f
commit 660da5b585
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fast/stage-links.sh
View File

@ -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

2
fast/stages-multitenant/0-bootstrap-tenant/README.md
View File

@ -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

1
modules/cloud-run/main.tf
View File

@ -259,6 +259,7 @@ resource "google_cloud_run_service" "service" {
metadata {
annotations = local.annotations
labels = var.labels
}
dynamic "traffic" {