kovagoadi/hunfabric
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify ip_ranges structure

Browse Source
This commit is contained in:
Julio Diez
2023-10-31 15:31:19 +01:00
parent 4d388f0bc4
commit 2fb387bd8b
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
blueprints/serverless/cloud-run-microservices/psc.tf
View File

@@ -23,7 +23,7 @@ module "psc-addr-main" {
project_id = module.main-project.project_id
psc_addresses = {
psc-addr = {
address = var.ip_ranges["main"].psc_addr
address = var.ip_ranges.psc_addr
network = module.vpc-main.self_link
}
}

16
blueprints/serverless/cloud-run-microservices/variables.tf
View File

@@ -21,16 +21,14 @@ variable "custom_domain" {
}
variable "ip_ranges" {
description = "IPs or IP ranges used by the VPC."
type = map(map(string))
description = "IP ranges or IPs used by the VPC."
type = map(string)
default = {
main = {
subnet_main = "10.0.1.0/24"
subnet_proxy = "10.10.0.0/24"
subnet_vpc_access = "10.10.10.0/28"
subnet_vpc_direct = "10.8.0.0/26"
psc_addr = "10.0.0.100"
}
subnet_main = "10.0.1.0/24"
subnet_proxy = "10.10.0.0/24"
subnet_vpc_access = "10.10.10.0/28"
subnet_vpc_direct = "10.8.0.0/26"
psc_addr = "10.0.0.100"
}
}

8
blueprints/serverless/cloud-run-microservices/vpc.tf
View File

@@ -23,24 +23,24 @@ module "vpc-main" {
name = "vpc-main"
subnets = [
{ # regular subnet
ip_cidr_range = var.ip_ranges["main"].subnet_main
ip_cidr_range = var.ip_ranges.subnet_main
name = "subnet-main"
region = var.region
},
{ # subnet for VPC access connector
ip_cidr_range = var.ip_ranges["main"].subnet_vpc_access
ip_cidr_range = var.ip_ranges.subnet_vpc_access
name = "subnet-vpc-access"
region = var.region
},
{ # subnet for Direct VPC Egress
ip_cidr_range = var.ip_ranges["main"].subnet_vpc_direct
ip_cidr_range = var.ip_ranges.subnet_vpc_direct
name = "subnet-vpc-direct"
region = var.region
}
]
subnets_proxy_only = [
{ # subnet for internal ALB
ip_cidr_range = var.ip_ranges["main"].subnet_proxy
ip_cidr_range = var.ip_ranges.subnet_proxy
name = "subnet-proxy"
region = var.region
active = true