github-personal/firezone
1
0
Fork 0
mirror of https://github.com/outbackdingo/firezone.git synced 2026-01-27 18:18:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(infra): Limit relays to used regions and expected load (#3540)

Browse Source 
Fixes #3537
This commit is contained in:
Jamil
2024-02-05 07:52:06 -08:00
committed by GitHub
parent ed1ceb7e6e
commit 6345eef8a4
2 changed files with 46 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
terraform/environments/production/main.tf
View File

@@ -725,29 +725,43 @@ module "relays" {
project_id = module.google-cloud-project.project.project_id
instances = {
"asia-east1" = {
type = "n1-standard-1"
replicas = 1
zones = ["asia-east1-a"]
}
"asia-south1" = {
type = "n1-standard-1"
replicas = 1
zones = ["asia-south1-a"]
}
"australia-southeast1" = {
type = "n1-standard-1"
replicas = 1
zones = ["australia-southeast1-a"]
}
"me-central1" = {
type = "n2-standard-2"
replicas = 1
zones = ["me-central1-a"]
}
# XXX: We may need these in the future, but for now, we don't have many
# (if any) Enterprise customers in these regions
# "asia-east1" = {
# type = "n1-standard-1"
# replicas = 1
# zones = ["asia-east1-a"]
# }
#
# "asia-south1" = {
# type = "n1-standard-1"
# replicas = 1
# zones = ["asia-south1-a"]
# }
#
# "australia-southeast1" = {
# type = "n1-standard-1"
# replicas = 1
# zones = ["australia-southeast1-a"]
# }
#
# "me-central1" = {
# type = "n2-standard-2"
# replicas = 1
# zones = ["me-central1-a"]
# }
#
# "southamerica-east1" = {
# type = "n1-standard-1"
# replicas = 1
# zones = ["southamerica-east1-b"]
# }
#
# "us-central1" = {
# type = "n1-standard-1"
# replicas = 1
# zones = ["us-central1-b"]
# }
"europe-west1" = {
type = "n1-standard-1"
@@ -755,10 +769,10 @@ module "relays" {
zones = ["europe-west1-d"]
}
"southamerica-east1" = {
"europe-west2" = {
type = "n1-standard-1"
replicas = 1
zones = ["southamerica-east1-b"]
zones = ["europe-west2-c"]
}
"us-east1" = {
@@ -772,12 +786,6 @@ module "relays" {
replicas = 1
zones = ["us-west2-b"]
}
"us-central1" = {
type = "n1-standard-1"
replicas = 1
zones = ["us-central1-b"]
}
}
container_registry = module.google-artifact-registry.url

38
terraform/environments/staging/main.tf
View File

@@ -692,56 +692,32 @@ module "relays" {
project_id = module.google-cloud-project.project.project_id
instances = {
"asia-east1" = {
type = "n1-standard-1"
replicas = 1
zones = ["asia-east1-a"]
}
"asia-south1" = {
type = "n1-standard-1"
replicas = 1
zones = ["asia-south1-a"]
}
"australia-southeast1" = {
type = "n1-standard-1"
type = "f1-micro"
replicas = 1
zones = ["australia-southeast1-a"]
}
"me-central1" = {
type = "n2-standard-2"
"southamerica-west1" = {
type = "f1-micro"
replicas = 1
zones = ["me-central1-a"]
}
"europe-west1" = {
type = "n1-standard-1"
replicas = 1
zones = ["europe-west1-d"]
}
"southamerica-east1" = {
type = "n1-standard-1"
replicas = 1
zones = ["southamerica-east1-b"]
zones = ["southamerica-west1-b"]
}
"us-east1" = {
type = "n1-standard-1"
type = "f1-micro"
replicas = 1
zones = ["us-east1-d"]
}
"us-west2" = {
type = "n1-standard-1"
type = "f1-micro"
replicas = 1
zones = ["us-west2-b"]
}
"us-central1" = {
type = "n1-standard-1"
type = "f1-micro"
replicas = 1
zones = ["us-central1-b"]
}