formatting
This commit is contained in:
parent
c886fe150d
commit
e6086816c5
|
@ -22,20 +22,20 @@ locals {
|
||||||
]
|
]
|
||||||
iam = {
|
iam = {
|
||||||
# CloudSQL
|
# CloudSQL
|
||||||
"roles/cloudsql.admin" = local.all_principals_iam
|
"roles/cloudsql.admin" = local.all_principals_iam
|
||||||
"roles/cloudsql.client" = local.all_principals_iam
|
"roles/cloudsql.client" = local.all_principals_iam
|
||||||
"roles/cloudsql.instanceUser" = local.all_principals_iam
|
"roles/cloudsql.instanceUser" = local.all_principals_iam
|
||||||
# common roles
|
# common roles
|
||||||
"roles/logging.admin" = local.all_principals_iam
|
"roles/logging.admin" = local.all_principals_iam
|
||||||
"roles/iam.serviceAccountUser" = local.all_principals_iam
|
"roles/iam.serviceAccountUser" = local.all_principals_iam
|
||||||
"roles/iam.serviceAccountTokenCreator" = local.all_principals_iam
|
"roles/iam.serviceAccountTokenCreator" = local.all_principals_iam
|
||||||
}
|
}
|
||||||
cloud_sql_conf = {
|
cloud_sql_conf = {
|
||||||
database_version = "MYSQL_8_0"
|
database_version = "MYSQL_8_0"
|
||||||
tier = "db-g1-small"
|
tier = "db-g1-small"
|
||||||
db = "wp-mysql"
|
db = "wp-mysql"
|
||||||
user = "admin"
|
user = "admin"
|
||||||
pass = "password"
|
pass = "password"
|
||||||
}
|
}
|
||||||
wp_user = "user"
|
wp_user = "user"
|
||||||
}
|
}
|
||||||
|
@ -67,8 +67,8 @@ resource "random_password" "wp_password" {
|
||||||
module "cloud_run" { # create the Cloud Run service
|
module "cloud_run" { # create the Cloud Run service
|
||||||
source = "../../../../modules/cloud-run"
|
source = "../../../../modules/cloud-run"
|
||||||
project_id = module.project.project_id
|
project_id = module.project.project_id
|
||||||
name = "${local.prefix}cr-wordpress"
|
name = "${local.prefix}cr-wordpress"
|
||||||
region = var.region
|
region = var.region
|
||||||
|
|
||||||
containers = [{
|
containers = [{
|
||||||
image = var.wordpress_image
|
image = var.wordpress_image
|
||||||
|
@ -81,22 +81,22 @@ module "cloud_run" { # create the Cloud Run service
|
||||||
command = null
|
command = null
|
||||||
args = null
|
args = null
|
||||||
env_from = null
|
env_from = null
|
||||||
env = { # set up the database connection
|
env = { # set up the database connection
|
||||||
"APACHE_HTTP_PORT_NUMBER" : var.wordpress_port
|
"APACHE_HTTP_PORT_NUMBER" : var.wordpress_port
|
||||||
"WORDPRESS_DATABASE_HOST" : module.cloudsql.ip
|
"WORDPRESS_DATABASE_HOST" : module.cloudsql.ip
|
||||||
"WORDPRESS_DATABASE_NAME" : local.cloud_sql_conf.db
|
"WORDPRESS_DATABASE_NAME" : local.cloud_sql_conf.db
|
||||||
"WORDPRESS_DATABASE_USER" : local.cloud_sql_conf.user
|
"WORDPRESS_DATABASE_USER" : local.cloud_sql_conf.user
|
||||||
"WORDPRESS_DATABASE_PASSWORD": local.cloud_sql_conf.pass
|
"WORDPRESS_DATABASE_PASSWORD" : local.cloud_sql_conf.pass
|
||||||
"WORDPRESS_USERNAME" : local.wp_user
|
"WORDPRESS_USERNAME" : local.wp_user
|
||||||
"WORDPRESS_PASSWORD" : random_password.wp_password.result
|
"WORDPRESS_PASSWORD" : random_password.wp_password.result
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
resources = null
|
resources = null
|
||||||
volume_mounts = null
|
volume_mounts = null
|
||||||
}]
|
}]
|
||||||
|
|
||||||
iam = {
|
iam = {
|
||||||
"roles/run.invoker": [var.cloud_run_invoker]
|
"roles/run.invoker" : [var.cloud_run_invoker]
|
||||||
}
|
}
|
||||||
|
|
||||||
revision_annotations = {
|
revision_annotations = {
|
||||||
|
@ -105,7 +105,7 @@ module "cloud_run" { # create the Cloud Run service
|
||||||
max_scale = 2
|
max_scale = 2
|
||||||
}
|
}
|
||||||
# connect to CloudSQL
|
# connect to CloudSQL
|
||||||
cloudsql_instances = [ module.cloudsql.connection_name ]
|
cloudsql_instances = [module.cloudsql.connection_name]
|
||||||
vpcaccess_connector = null
|
vpcaccess_connector = null
|
||||||
vpcaccess_egress = "all-traffic" # allow all traffic
|
vpcaccess_egress = "all-traffic" # allow all traffic
|
||||||
}
|
}
|
||||||
|
@ -123,7 +123,7 @@ module "vpc" { # create a VPC for CloudSQL
|
||||||
source = "../../../../modules/net-vpc"
|
source = "../../../../modules/net-vpc"
|
||||||
project_id = module.project.project_id
|
project_id = module.project.project_id
|
||||||
name = "${local.prefix}sql-vpc"
|
name = "${local.prefix}sql-vpc"
|
||||||
subnets = [
|
subnets = [
|
||||||
{
|
{
|
||||||
ip_cidr_range = var.sql_vpc_cidr
|
ip_cidr_range = var.sql_vpc_cidr
|
||||||
name = "subnet"
|
name = "subnet"
|
||||||
|
@ -150,15 +150,15 @@ module "firewall" { # set up firewall for CloudSQL
|
||||||
|
|
||||||
|
|
||||||
module "cloudsql" { # Set up CloudSQL
|
module "cloudsql" { # Set up CloudSQL
|
||||||
source = "../../../../modules/cloudsql-instance"
|
source = "../../../../modules/cloudsql-instance"
|
||||||
project_id = module.project.project_id
|
project_id = module.project.project_id
|
||||||
network = module.vpc.self_link
|
network = module.vpc.self_link
|
||||||
name = "${local.prefix}mysql"
|
name = "${local.prefix}mysql"
|
||||||
region = var.region
|
region = var.region
|
||||||
database_version = local.cloud_sql_conf.database_version
|
database_version = local.cloud_sql_conf.database_version
|
||||||
tier = local.cloud_sql_conf.tier
|
tier = local.cloud_sql_conf.tier
|
||||||
databases = [local.cloud_sql_conf.db]
|
databases = [local.cloud_sql_conf.db]
|
||||||
users = {
|
users = {
|
||||||
"${local.cloud_sql_conf.user}" = "${local.cloud_sql_conf.pass}"
|
"${local.cloud_sql_conf.user}" = "${local.cloud_sql_conf.pass}"
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue