Leverage new shared VPC project config defaults across the repo
This commit is contained in:
parent
3c3e65c2c3
commit
894647ff9e
|
@ -143,7 +143,6 @@ module "project" {
|
||||||
shared_vpc_service_config = {
|
shared_vpc_service_config = {
|
||||||
attach = true
|
attach = true
|
||||||
host_project = "project-host"
|
host_project = "project-host"
|
||||||
service_identity_iam = {}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
@ -260,7 +259,6 @@ module "project" {
|
||||||
shared_vpc_service_config = {
|
shared_vpc_service_config = {
|
||||||
attach = true
|
attach = true
|
||||||
host_project = "project-host"
|
host_project = "project-host"
|
||||||
service_identity_iam = {}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
|
@ -38,7 +38,6 @@ module "project-host" {
|
||||||
|
|
||||||
shared_vpc_host_config = {
|
shared_vpc_host_config = {
|
||||||
enabled = true
|
enabled = true
|
||||||
service_projects = [] # defined later
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,6 @@ module "project-hub" {
|
||||||
|
|
||||||
shared_vpc_host_config = {
|
shared_vpc_host_config = {
|
||||||
enabled = true
|
enabled = true
|
||||||
service_projects = [] # defined later
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -60,7 +59,6 @@ module "project-svc-hub" {
|
||||||
shared_vpc_service_config = {
|
shared_vpc_service_config = {
|
||||||
attach = true
|
attach = true
|
||||||
host_project = module.project-hub.project_id
|
host_project = module.project-hub.project_id
|
||||||
service_identity_iam = {}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -74,7 +72,6 @@ module "project-prod" {
|
||||||
|
|
||||||
shared_vpc_host_config = {
|
shared_vpc_host_config = {
|
||||||
enabled = true
|
enabled = true
|
||||||
service_projects = [] # defined later
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -103,7 +100,6 @@ module "project-svc-prod" {
|
||||||
shared_vpc_service_config = {
|
shared_vpc_service_config = {
|
||||||
attach = true
|
attach = true
|
||||||
host_project = module.project-prod.project_id
|
host_project = module.project-prod.project_id
|
||||||
service_identity_iam = {}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -117,7 +113,6 @@ module "project-dev" {
|
||||||
|
|
||||||
shared_vpc_host_config = {
|
shared_vpc_host_config = {
|
||||||
enabled = true
|
enabled = true
|
||||||
service_projects = [] # defined later
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -146,7 +141,6 @@ module "project-svc-dev" {
|
||||||
shared_vpc_service_config = {
|
shared_vpc_service_config = {
|
||||||
attach = true
|
attach = true
|
||||||
host_project = module.project-dev.project_id
|
host_project = module.project-dev.project_id
|
||||||
service_identity_iam = {}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -96,7 +96,6 @@ module "project" {
|
||||||
shared_vpc_service_config = local.shared_vpc_project == null ? null : {
|
shared_vpc_service_config = local.shared_vpc_project == null ? null : {
|
||||||
attach = true
|
attach = true
|
||||||
host_project = local.shared_vpc_project
|
host_project = local.shared_vpc_project
|
||||||
service_identity_iam = {}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
service_encryption_key_ids = {
|
service_encryption_key_ids = {
|
||||||
|
|
|
@ -99,7 +99,6 @@ module "project" {
|
||||||
shared_vpc_service_config = local.shared_vpc_project == null ? null : {
|
shared_vpc_service_config = local.shared_vpc_project == null ? null : {
|
||||||
attach = true
|
attach = true
|
||||||
host_project = local.shared_vpc_project
|
host_project = local.shared_vpc_project
|
||||||
service_identity_iam = {}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
service_encryption_key_ids = {
|
service_encryption_key_ids = {
|
||||||
|
|
|
@ -76,7 +76,6 @@ module "load-project" {
|
||||||
shared_vpc_service_config = local.shared_vpc_project == null ? null : {
|
shared_vpc_service_config = local.shared_vpc_project == null ? null : {
|
||||||
attach = true
|
attach = true
|
||||||
host_project = local.shared_vpc_project
|
host_project = local.shared_vpc_project
|
||||||
service_identity_iam = {}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -94,7 +94,6 @@ module "orch-project" {
|
||||||
shared_vpc_service_config = local.shared_vpc_project == null ? null : {
|
shared_vpc_service_config = local.shared_vpc_project == null ? null : {
|
||||||
attach = true
|
attach = true
|
||||||
host_project = local.shared_vpc_project
|
host_project = local.shared_vpc_project
|
||||||
service_identity_iam = {}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -74,7 +74,6 @@ module "transf-project" {
|
||||||
shared_vpc_service_config = local.shared_vpc_project == null ? null : {
|
shared_vpc_service_config = local.shared_vpc_project == null ? null : {
|
||||||
attach = true
|
attach = true
|
||||||
host_project = local.shared_vpc_project
|
host_project = local.shared_vpc_project
|
||||||
service_identity_iam = {}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -127,7 +127,6 @@ module "project" {
|
||||||
shared_vpc_service_config = local.shared_vpc_project == null ? null : {
|
shared_vpc_service_config = local.shared_vpc_project == null ? null : {
|
||||||
attach = true
|
attach = true
|
||||||
host_project = local.shared_vpc_project
|
host_project = local.shared_vpc_project
|
||||||
service_identity_iam = {}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -51,6 +51,5 @@ module "project" {
|
||||||
shared_vpc_service_config = var.shared_vpc_project_id == null ? null : {
|
shared_vpc_service_config = var.shared_vpc_project_id == null ? null : {
|
||||||
attach = true
|
attach = true
|
||||||
host_project = var.shared_vpc_project_id
|
host_project = var.shared_vpc_project_id
|
||||||
service_identity_iam = {}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,7 +25,6 @@ module "host_project" {
|
||||||
name = var.host_project_id
|
name = var.host_project_id
|
||||||
shared_vpc_host_config = {
|
shared_vpc_host_config = {
|
||||||
enabled = true
|
enabled = true
|
||||||
service_projects = []
|
|
||||||
}
|
}
|
||||||
services = [
|
services = [
|
||||||
"container.googleapis.com"
|
"container.googleapis.com"
|
||||||
|
|
|
@ -26,7 +26,6 @@ module "project-host-prod" {
|
||||||
|
|
||||||
shared_vpc_host_config = {
|
shared_vpc_host_config = {
|
||||||
enabled = true
|
enabled = true
|
||||||
service_projects = []
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -40,7 +39,6 @@ module "project-host-dev" {
|
||||||
|
|
||||||
shared_vpc_host_config = {
|
shared_vpc_host_config = {
|
||||||
enabled = true
|
enabled = true
|
||||||
service_projects = []
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -49,7 +49,6 @@ module "project-host" {
|
||||||
]
|
]
|
||||||
shared_vpc_host_config = {
|
shared_vpc_host_config = {
|
||||||
enabled = true
|
enabled = true
|
||||||
service_projects = []
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,6 @@ module "project-host" {
|
||||||
services = concat(var.project_services, ["dns.googleapis.com"])
|
services = concat(var.project_services, ["dns.googleapis.com"])
|
||||||
shared_vpc_host_config = {
|
shared_vpc_host_config = {
|
||||||
enabled = true
|
enabled = true
|
||||||
service_projects = [] # defined later
|
|
||||||
}
|
}
|
||||||
iam = {
|
iam = {
|
||||||
"roles/owner" = var.owners_host
|
"roles/owner" = var.owners_host
|
||||||
|
|
|
@ -31,7 +31,6 @@ module "landing-project" {
|
||||||
]
|
]
|
||||||
shared_vpc_host_config = {
|
shared_vpc_host_config = {
|
||||||
enabled = true
|
enabled = true
|
||||||
service_projects = []
|
|
||||||
}
|
}
|
||||||
iam = {
|
iam = {
|
||||||
"roles/dns.admin" = compact([
|
"roles/dns.admin" = compact([
|
||||||
|
|
|
@ -32,7 +32,6 @@ module "dev-spoke-project" {
|
||||||
]
|
]
|
||||||
shared_vpc_host_config = {
|
shared_vpc_host_config = {
|
||||||
enabled = true
|
enabled = true
|
||||||
service_projects = []
|
|
||||||
}
|
}
|
||||||
metric_scopes = [module.landing-project.project_id]
|
metric_scopes = [module.landing-project.project_id]
|
||||||
iam = {
|
iam = {
|
||||||
|
|
|
@ -32,7 +32,6 @@ module "prod-spoke-project" {
|
||||||
]
|
]
|
||||||
shared_vpc_host_config = {
|
shared_vpc_host_config = {
|
||||||
enabled = true
|
enabled = true
|
||||||
service_projects = []
|
|
||||||
}
|
}
|
||||||
metric_scopes = [module.landing-project.project_id]
|
metric_scopes = [module.landing-project.project_id]
|
||||||
iam = {
|
iam = {
|
||||||
|
|
|
@ -31,7 +31,6 @@ module "landing-project" {
|
||||||
]
|
]
|
||||||
shared_vpc_host_config = {
|
shared_vpc_host_config = {
|
||||||
enabled = true
|
enabled = true
|
||||||
service_projects = []
|
|
||||||
}
|
}
|
||||||
iam = {
|
iam = {
|
||||||
"roles/dns.admin" = compact([
|
"roles/dns.admin" = compact([
|
||||||
|
|
|
@ -33,7 +33,6 @@ module "dev-spoke-project" {
|
||||||
]
|
]
|
||||||
shared_vpc_host_config = {
|
shared_vpc_host_config = {
|
||||||
enabled = true
|
enabled = true
|
||||||
service_projects = []
|
|
||||||
}
|
}
|
||||||
metric_scopes = [module.landing-project.project_id]
|
metric_scopes = [module.landing-project.project_id]
|
||||||
iam = {
|
iam = {
|
||||||
|
|
|
@ -33,7 +33,6 @@ module "prod-spoke-project" {
|
||||||
]
|
]
|
||||||
shared_vpc_host_config = {
|
shared_vpc_host_config = {
|
||||||
enabled = true
|
enabled = true
|
||||||
service_projects = []
|
|
||||||
}
|
}
|
||||||
metric_scopes = [module.landing-project.project_id]
|
metric_scopes = [module.landing-project.project_id]
|
||||||
iam = {
|
iam = {
|
||||||
|
|
|
@ -31,7 +31,6 @@ module "landing-project" {
|
||||||
]
|
]
|
||||||
shared_vpc_host_config = {
|
shared_vpc_host_config = {
|
||||||
enabled = true
|
enabled = true
|
||||||
service_projects = []
|
|
||||||
}
|
}
|
||||||
iam = {
|
iam = {
|
||||||
"roles/dns.admin" = compact([
|
"roles/dns.admin" = compact([
|
||||||
|
|
|
@ -33,7 +33,6 @@ module "dev-spoke-project" {
|
||||||
]
|
]
|
||||||
shared_vpc_host_config = {
|
shared_vpc_host_config = {
|
||||||
enabled = true
|
enabled = true
|
||||||
service_projects = []
|
|
||||||
}
|
}
|
||||||
metric_scopes = [module.landing-project.project_id]
|
metric_scopes = [module.landing-project.project_id]
|
||||||
iam = {
|
iam = {
|
||||||
|
|
|
@ -33,7 +33,6 @@ module "prod-spoke-project" {
|
||||||
]
|
]
|
||||||
shared_vpc_host_config = {
|
shared_vpc_host_config = {
|
||||||
enabled = true
|
enabled = true
|
||||||
service_projects = []
|
|
||||||
}
|
}
|
||||||
metric_scopes = [module.landing-project.project_id]
|
metric_scopes = [module.landing-project.project_id]
|
||||||
iam = {
|
iam = {
|
||||||
|
|
|
@ -124,7 +124,6 @@ module "project" {
|
||||||
name = "project-example"
|
name = "project-example"
|
||||||
shared_vpc_host_config = {
|
shared_vpc_host_config = {
|
||||||
enabled = true
|
enabled = true
|
||||||
service_projects = []
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
# tftest modules=1 resources=2
|
# tftest modules=1 resources=2
|
||||||
|
|
Loading…
Reference in New Issue