Remove project.service_config instances using the new default
This commit is contained in:
parent
67c031c41c
commit
f8e2fdaf19
|
@ -29,10 +29,6 @@ module "project" {
|
|||
"cloudfunctions.googleapis.com",
|
||||
"compute.googleapis.com"
|
||||
]
|
||||
service_config = {
|
||||
disable_on_destroy = false,
|
||||
disable_dependent_services = false
|
||||
}
|
||||
custom_roles = {
|
||||
(local.role_name) = [
|
||||
"compute.instances.list",
|
||||
|
|
|
@ -30,10 +30,6 @@ module "project" {
|
|||
"dns.googleapis.com",
|
||||
"servicedirectory.googleapis.com"
|
||||
]
|
||||
service_config = {
|
||||
disable_on_destroy = false,
|
||||
disable_dependent_services = false
|
||||
}
|
||||
}
|
||||
|
||||
module "vpc" {
|
||||
|
|
|
@ -29,10 +29,6 @@ module "project" {
|
|||
parent = var.folder_id
|
||||
prefix = var.prefix
|
||||
services = var.project_services
|
||||
service_config = {
|
||||
disable_on_destroy = false,
|
||||
disable_dependent_services = false
|
||||
}
|
||||
}
|
||||
|
||||
module "vpc" {
|
||||
|
|
|
@ -33,10 +33,6 @@ module "project" {
|
|||
services = [
|
||||
"compute.googleapis.com"
|
||||
]
|
||||
service_config = {
|
||||
disable_on_destroy = false
|
||||
disable_dependent_services = false
|
||||
}
|
||||
project_create = var.project_create != null
|
||||
}
|
||||
|
||||
|
|
|
@ -30,10 +30,6 @@ module "project" {
|
|||
services = [
|
||||
"compute.googleapis.com"
|
||||
]
|
||||
service_config = {
|
||||
disable_on_destroy = false
|
||||
disable_dependent_services = false
|
||||
}
|
||||
}
|
||||
|
||||
module "service-account-image-builder" {
|
||||
|
|
|
@ -30,10 +30,6 @@ module "project" {
|
|||
"compute.googleapis.com",
|
||||
"cloudfunctions.googleapis.com"
|
||||
]
|
||||
service_config = {
|
||||
disable_on_destroy = false,
|
||||
disable_dependent_services = false
|
||||
}
|
||||
iam = {
|
||||
"roles/monitoring.metricWriter" = [module.cf.service_account_iam_email]
|
||||
}
|
||||
|
|
|
@ -77,9 +77,6 @@ module "project" {
|
|||
"storage.googleapis.com",
|
||||
"storage-component.googleapis.com",
|
||||
]
|
||||
service_config = {
|
||||
disable_on_destroy = false, disable_dependent_services = false
|
||||
}
|
||||
}
|
||||
|
||||
module "vpc" {
|
||||
|
|
|
@ -49,11 +49,6 @@ module "project" {
|
|||
bq = [try(local.service_encryption_keys.bq, null)]
|
||||
storage = [try(local.service_encryption_keys.storage, null)]
|
||||
}
|
||||
|
||||
service_config = {
|
||||
disable_on_destroy = false,
|
||||
disable_dependent_services = false
|
||||
}
|
||||
}
|
||||
|
||||
###############################################################################
|
||||
|
|
|
@ -129,9 +129,6 @@ module "project" {
|
|||
host_project = local.shared_vpc_project
|
||||
service_identity_iam = {}
|
||||
}
|
||||
service_config = {
|
||||
disable_on_destroy = false, disable_dependent_services = false
|
||||
}
|
||||
}
|
||||
|
||||
resource "google_project_iam_member" "shared_vpc" {
|
||||
|
|
|
@ -53,7 +53,4 @@ module "project" {
|
|||
host_project = var.shared_vpc_project_id
|
||||
service_identity_iam = {}
|
||||
}
|
||||
service_config = {
|
||||
disable_on_destroy = false, disable_dependent_services = false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -44,10 +44,6 @@ module "gke-project-0" {
|
|||
],
|
||||
var.project_services
|
||||
)
|
||||
service_config = {
|
||||
disable_on_destroy = false
|
||||
disable_dependent_services = false
|
||||
}
|
||||
shared_vpc_service_config = {
|
||||
attach = true
|
||||
host_project = var.vpc_config.host_project_id
|
||||
|
|
|
@ -40,10 +40,6 @@ module "project" {
|
|||
"compute.googleapis.com",
|
||||
"container.googleapis.com"
|
||||
]
|
||||
service_config = {
|
||||
disable_on_destroy = false,
|
||||
disable_dependent_services = false
|
||||
}
|
||||
}
|
||||
|
||||
################################################################################
|
||||
|
|
|
@ -45,10 +45,6 @@ module "project" {
|
|||
"compute.googleapis.com",
|
||||
"dns.googleapis.com"
|
||||
]
|
||||
service_config = {
|
||||
disable_on_destroy = false
|
||||
disable_dependent_services = false
|
||||
}
|
||||
}
|
||||
|
||||
# tftest skip
|
||||
|
|
|
@ -28,10 +28,6 @@ module "project" {
|
|||
"compute.googleapis.com",
|
||||
"dns.googleapis.com"
|
||||
]
|
||||
service_config = {
|
||||
disable_on_destroy = false
|
||||
disable_dependent_services = false
|
||||
}
|
||||
}
|
||||
|
||||
# test VM in landing region 1
|
||||
|
|
|
@ -31,10 +31,6 @@ module "project" {
|
|||
"compute.googleapis.com",
|
||||
"dns.googleapis.com",
|
||||
]
|
||||
service_config = {
|
||||
disable_on_destroy = false
|
||||
disable_dependent_services = false
|
||||
}
|
||||
}
|
||||
|
||||
module "service-accounts" {
|
||||
|
|
|
@ -24,10 +24,6 @@ module "project" {
|
|||
project_create = var.project_create == null ? false : true
|
||||
billing_account = try(var.project_create.billing_account_id, null)
|
||||
parent = try(var.project_create.parent, null)
|
||||
service_config = {
|
||||
disable_dependent_services = false
|
||||
disable_on_destroy = false
|
||||
}
|
||||
services = [
|
||||
"cloudfunctions.googleapis.com",
|
||||
"cloudbuild.googleapis.com",
|
||||
|
|
|
@ -22,10 +22,6 @@ module "landing-project" {
|
|||
name = "prod-net-landing-0"
|
||||
parent = var.folder_ids.networking-prod
|
||||
prefix = var.prefix
|
||||
service_config = {
|
||||
disable_on_destroy = false
|
||||
disable_dependent_services = false
|
||||
}
|
||||
services = [
|
||||
"compute.googleapis.com",
|
||||
"dns.googleapis.com",
|
||||
|
|
|
@ -22,10 +22,6 @@ module "dev-spoke-project" {
|
|||
name = "dev-net-spoke-0"
|
||||
parent = var.folder_ids.networking-dev
|
||||
prefix = var.prefix
|
||||
service_config = {
|
||||
disable_on_destroy = false
|
||||
disable_dependent_services = false
|
||||
}
|
||||
services = [
|
||||
"compute.googleapis.com",
|
||||
"dns.googleapis.com",
|
||||
|
|
|
@ -22,10 +22,6 @@ module "prod-spoke-project" {
|
|||
name = "prod-net-spoke-0"
|
||||
parent = var.folder_ids.networking-prod
|
||||
prefix = var.prefix
|
||||
service_config = {
|
||||
disable_on_destroy = false
|
||||
disable_dependent_services = false
|
||||
}
|
||||
services = [
|
||||
"compute.googleapis.com",
|
||||
"dns.googleapis.com",
|
||||
|
|
|
@ -22,10 +22,6 @@ module "landing-project" {
|
|||
name = "prod-net-landing-0"
|
||||
parent = var.folder_ids.networking-prod
|
||||
prefix = var.prefix
|
||||
service_config = {
|
||||
disable_on_destroy = false
|
||||
disable_dependent_services = false
|
||||
}
|
||||
services = [
|
||||
"compute.googleapis.com",
|
||||
"dns.googleapis.com",
|
||||
|
|
|
@ -22,10 +22,6 @@ module "dev-spoke-project" {
|
|||
name = "dev-net-spoke-0"
|
||||
parent = var.folder_ids.networking-dev
|
||||
prefix = var.prefix
|
||||
service_config = {
|
||||
disable_on_destroy = false
|
||||
disable_dependent_services = false
|
||||
}
|
||||
services = [
|
||||
"container.googleapis.com",
|
||||
"compute.googleapis.com",
|
||||
|
|
|
@ -22,10 +22,6 @@ module "prod-spoke-project" {
|
|||
name = "prod-net-spoke-0"
|
||||
parent = var.folder_ids.networking-prod
|
||||
prefix = var.prefix
|
||||
service_config = {
|
||||
disable_on_destroy = false
|
||||
disable_dependent_services = false
|
||||
}
|
||||
services = [
|
||||
"container.googleapis.com",
|
||||
"compute.googleapis.com",
|
||||
|
|
|
@ -22,10 +22,6 @@ module "landing-project" {
|
|||
name = "prod-net-landing-0"
|
||||
parent = var.folder_ids.networking-prod
|
||||
prefix = var.prefix
|
||||
service_config = {
|
||||
disable_on_destroy = false
|
||||
disable_dependent_services = false
|
||||
}
|
||||
services = [
|
||||
"compute.googleapis.com",
|
||||
"dns.googleapis.com",
|
||||
|
|
|
@ -22,10 +22,6 @@ module "dev-spoke-project" {
|
|||
name = "dev-net-spoke-0"
|
||||
parent = var.folder_ids.networking-dev
|
||||
prefix = var.prefix
|
||||
service_config = {
|
||||
disable_on_destroy = false
|
||||
disable_dependent_services = false
|
||||
}
|
||||
services = [
|
||||
"container.googleapis.com",
|
||||
"compute.googleapis.com",
|
||||
|
|
|
@ -22,10 +22,6 @@ module "prod-spoke-project" {
|
|||
name = "prod-net-spoke-0"
|
||||
parent = var.folder_ids.networking-prod
|
||||
prefix = var.prefix
|
||||
service_config = {
|
||||
disable_on_destroy = false
|
||||
disable_dependent_services = false
|
||||
}
|
||||
services = [
|
||||
"container.googleapis.com",
|
||||
"compute.googleapis.com",
|
||||
|
|
Loading…
Reference in New Issue