New IPs and fixes.
- Outpus `aws_ips` and `gcp_asia_southeast1_cidr` now point to the correct IPs. - 2 new regions for GCP: `asia-east1` and `asia-southeast2`. - New IPs for EKS in `us-east-1`
This commit is contained in:
parent
22fc207f90
commit
b140bbe083
20
locals.tf
20
locals.tf
|
@ -78,6 +78,14 @@ locals {
|
|||
"34.91.136.228"
|
||||
]
|
||||
|
||||
# Changhua County, Taiwan
|
||||
|
||||
gcp-asia-east1 = [
|
||||
"104.199.206.209",
|
||||
"34.80.173.212",
|
||||
"35.185.137.114",
|
||||
]
|
||||
|
||||
# Tokyo, Japan
|
||||
gcp-asia-northeast1 = [
|
||||
"34.84.255.194",
|
||||
|
@ -89,6 +97,13 @@ locals {
|
|||
"35.185.184.54"
|
||||
]
|
||||
|
||||
# Jakarta, Indonesia
|
||||
gcp-asia-southeast2 = [
|
||||
"34.101.158.88",
|
||||
"34.101.157.238",
|
||||
"34.101.184.52",
|
||||
]
|
||||
|
||||
# Sydney
|
||||
gcp-australia-southeast1 = [
|
||||
"35.189.54.47",
|
||||
|
@ -151,7 +166,10 @@ locals {
|
|||
"50.17.192.87",
|
||||
"18.235.225.163",
|
||||
"54.92.246.223",
|
||||
"75.101.147.97"
|
||||
"75.101.147.97",
|
||||
"3.212.72.104",
|
||||
"52.21.115.135",
|
||||
"18.210.252.49",
|
||||
]
|
||||
eks-ca-central-1 = [
|
||||
"52.60.157.61",
|
||||
|
|
45
outputs.tf
45
outputs.tf
|
@ -37,11 +37,13 @@ output "aws_ips" {
|
|||
description = "Legacy Hosting IP addresses for instances hosted anywhere that were created before 07/07/2020"
|
||||
|
||||
value = "${concat(
|
||||
local.gcp-us-east1,
|
||||
local.gcp-us-east4,
|
||||
local.gcp-us-west1,
|
||||
local.gcp-europe-west2,
|
||||
local.gcp-europe-west3,
|
||||
local.us,
|
||||
local.ca,
|
||||
local.as,
|
||||
local.ie,
|
||||
local.de,
|
||||
local.au,
|
||||
local.sa,
|
||||
)}"
|
||||
}
|
||||
|
||||
|
@ -140,6 +142,12 @@ output "gcp_europe_west3_ips" {
|
|||
value = "${local.gcp-europe-west3}"
|
||||
}
|
||||
|
||||
// Taiwan
|
||||
output "gcp_asia_east1_ips" {
|
||||
description = "IP addresses for instances hosted on GCP (Taiwan / asia-east1)"
|
||||
value = "${local.gcp-asia-east1}"
|
||||
}
|
||||
|
||||
// Tokyo
|
||||
output "gcp_asia_northeast1_ips" {
|
||||
description = "IP addresses for instances hosted on GCP (Tokyo / gcp-asia-northeast1)"
|
||||
|
@ -152,6 +160,12 @@ output "gcp_asia_southeast1_ips" {
|
|||
value = "${local.gcp-asia-southeast1}"
|
||||
}
|
||||
|
||||
// Jakarta
|
||||
output "gcp_asia_southeast2_ips" {
|
||||
description = "IP addresses for instances hosted on GCP (Jakarta / asia-southeast2)"
|
||||
value = "${local.gcp-asia-southeast2}"
|
||||
}
|
||||
|
||||
// Sydney
|
||||
output "gcp_australia_southeast1_ips" {
|
||||
description = "IP addresses for instances hosted on GCP (Sydney / australia-southeast1)"
|
||||
|
@ -211,6 +225,12 @@ output "gcp_europe_west3_cidr" {
|
|||
value = ["${formatlist("%s/32", local.gcp-europe-west3)}"]
|
||||
}
|
||||
|
||||
// Frankfurt
|
||||
output "gcp_asia_east1_cidr" {
|
||||
description = "CIDRs for instances hosted on GCP (Taiwan / asia-east1)"
|
||||
value = ["${formatlist("%s/32", local.gcp-asia-east1)}"]
|
||||
}
|
||||
|
||||
// Tokyo
|
||||
output "gcp_asia_northeast1_cidr" {
|
||||
description = "CIDRs for instances hosted on GCP (Tokyo / asia-northeast1)"
|
||||
|
@ -219,8 +239,14 @@ output "gcp_asia_northeast1_cidr" {
|
|||
|
||||
// Singapore
|
||||
output "gcp_asia_southeast1_cidr" {
|
||||
description = "CIDRs for instances hosted on GCP (South Carolina / us-east1)"
|
||||
value = ["${formatlist("%s/32", local.gcp-us-east1)}"]
|
||||
description = "CIDRs for instances hosted on GCP (Singapore / asia-southeast1)"
|
||||
value = ["${formatlist("%s/32", local.gcp-asia-southeast1)}"]
|
||||
}
|
||||
|
||||
// Jakarta
|
||||
output "gcp_asia_southeast2_cidr" {
|
||||
description = "CIDRs for instances hosted on GCP (Jakarta / asia-southeast2)"
|
||||
value = ["${formatlist("%s/32", local.gcp-asia-southeast2)}"]
|
||||
}
|
||||
|
||||
// Sydney
|
||||
|
@ -248,8 +274,9 @@ output "gcp_cidr" {
|
|||
local.gcp-northamerica-northeast1,
|
||||
local.gcp-europe-west2,
|
||||
local.gcp-europe-west3,
|
||||
local.gcp-asia-east1,
|
||||
local.gcp-asia-northeast1,
|
||||
local.gcp-asia-southeast1,
|
||||
local.gcp-asia-southeast2,
|
||||
local.gcp-australia-southeast1,
|
||||
local.gcp-southamerica-east1
|
||||
))}"
|
||||
|
@ -266,8 +293,10 @@ output "gcp_ips" {
|
|||
local.gcp-northamerica-northeast1,
|
||||
local.gcp-europe-west2,
|
||||
local.gcp-europe-west3,
|
||||
local.gcp-asia-east1,
|
||||
local.gcp-asia-northeast1,
|
||||
local.gcp-asia-southeast1,
|
||||
local.gcp-asia-southeast2,
|
||||
local.gcp-australia-southeast1,
|
||||
local.gcp-southamerica-east1
|
||||
)}"
|
||||
|
|
Loading…
Reference in New Issue