darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-03 01:41:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into jskinne3-upgrade-and-protect-bootstrap-env

Browse Source
This commit is contained in:
John Skiles Skinner
2024-06-18 16:33:23 -07:00
parent decbd254b0 833ebfa469
commit 560304e64f
4 changed files with 84 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
terraform/demo/main.tf
View File

@@ -16,7 +16,7 @@ module "database" {
rds_plan_name = "micro-psql"
}
module "redis" {
module "redis" { # default v6.2; delete after v7.0 resource is bound
source = "github.com/18f/terraform-cloudgov//redis?ref=v0.7.1"
cf_org_name = local.cf_org_name
@@ -26,6 +26,20 @@ module "redis" {
redis_plan_name = "redis-dev"
}
module "redis-v70" {
source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v1.0.0"
cf_org_name = local.cf_org_name
cf_space_name = local.cf_space_name
name = "${local.app_name}-redis-v70-${local.env}"
redis_plan_name = "redis-dev"
json_params = jsonencode(
{
"engineVersion" : "7.0",
}
)
}
module "csv_upload_bucket" {
source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1"

16
terraform/sandbox/main.tf
View File

@@ -22,7 +22,7 @@ module "database" {
rds_plan_name = "micro-psql"
}
module "redis" {
module "redis" { # default v6.2; delete after v7.0 resource is bound
source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v1.0.0"
cf_org_name = local.cf_org_name
@@ -31,6 +31,20 @@ module "redis" {
redis_plan_name = "redis-dev"
}
module "redis-v70" {
source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v1.0.0"
cf_org_name = local.cf_org_name
cf_space_name = local.cf_space_name
name = "${local.app_name}-redis-v70-${local.env}"
redis_plan_name = "redis-dev"
json_params = jsonencode(
{
"engineVersion" : "7.0",
}
)
}
module "csv_upload_bucket" {
source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v1.0.0"