darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-23 15:57:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Pull main

Browse Source
This commit is contained in:
Andrew Shumway
2024-06-26 08:34:47 -06:00
parent f218c01244 d59960df44
commit e3a85aab0c
14 changed files with 80 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/deploy-demo.yml vendored
View File

@@ -18,7 +18,7 @@ jobs:
- name: Check for changes to Terraform - name: Check for changes to Terraform
id: changed-terraform-files id: changed-terraform-files
uses: tj-actions/changed-files@v41.0.0 uses: tj-actions/changed-files@v44
with: with:
files: | files: |
terraform/demo terraform/demo
@@ -88,7 +88,7 @@ jobs:
- name: Check for changes to egress config - name: Check for changes to egress config
id: changed-egress-config id: changed-egress-config
uses: tj-actions/changed-files@v41.0.0 uses: tj-actions/changed-files@v44
with: with:
files: | files: |
deploy-config/egress_proxy/notify-admin-demo.*.acl deploy-config/egress_proxy/notify-admin-demo.*.acl

4
.github/workflows/deploy-prod.yml vendored
View File

@@ -18,7 +18,7 @@ jobs:
- name: Check for changes to Terraform - name: Check for changes to Terraform
id: changed-terraform-files id: changed-terraform-files
uses: tj-actions/changed-files@v41.0.0 uses: tj-actions/changed-files@v44
with: with:
files: | files: |
terraform/production terraform/production
@@ -88,7 +88,7 @@ jobs:
- name: Check for changes to egress config - name: Check for changes to egress config
id: changed-egress-config id: changed-egress-config
uses: tj-actions/changed-files@v41.0.0 uses: tj-actions/changed-files@v44
with: with:
files: | files: |
deploy-config/egress_proxy/notify-admin-production.*.acl deploy-config/egress_proxy/notify-admin-production.*.acl

4
.github/workflows/deploy.yml vendored
View File

@@ -23,7 +23,7 @@ jobs:
- name: Check for changes to Terraform - name: Check for changes to Terraform
id: changed-terraform-files id: changed-terraform-files
uses: tj-actions/changed-files@v41.0.0 uses: tj-actions/changed-files@v44
with: with:
files: | files: |
terraform/staging terraform/staging
@@ -95,7 +95,7 @@ jobs:
- name: Check for changes to egress config - name: Check for changes to egress config
id: changed-egress-config id: changed-egress-config
uses: tj-actions/changed-files@v41.0.0 uses: tj-actions/changed-files@v44
with: with:
files: | files: |
deploy-config/egress_proxy/notify-admin-staging.*.acl deploy-config/egress_proxy/notify-admin-staging.*.acl

4
terraform/bootstrap/providers.tf
View File

@@ -1,9 +1,9 @@
terraform { terraform {
required_version = "~> 1.0" required_version = "~> 1.7"
required_providers { required_providers {
cloudfoundry = { cloudfoundry = {
source = "cloudfoundry-community/cloudfoundry" source = "cloudfoundry-community/cloudfoundry"
version = "0.53.0" version = "0.53.1"
} }
} }
} }

16
terraform/demo/main.tf
View File

@@ -6,7 +6,7 @@ locals {
recursive_delete = false recursive_delete = false
} }
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" source = "github.com/18f/terraform-cloudgov//redis?ref=v0.7.1"
cf_org_name = local.cf_org_name cf_org_name = local.cf_org_name
@@ -16,6 +16,20 @@ module "redis" {
redis_plan_name = "redis-dev" 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 "logo_upload_bucket" { module "logo_upload_bucket" {
source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1" source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1"

4
terraform/demo/providers.tf
View File

@@ -1,9 +1,9 @@
terraform { terraform {
required_version = "~> 1.0" required_version = "~> 1.7"
required_providers { required_providers {
cloudfoundry = { cloudfoundry = {
source = "cloudfoundry-community/cloudfoundry" source = "cloudfoundry-community/cloudfoundry"
version = "0.53.0" version = "0.53.1"
} }
} }

4
terraform/development/providers.tf
View File

@@ -1,9 +1,9 @@
terraform { terraform {
required_version = "~> 1.0" required_version = "~> 1.7"
required_providers { required_providers {
cloudfoundry = { cloudfoundry = {
source = "cloudfoundry-community/cloudfoundry" source = "cloudfoundry-community/cloudfoundry"
version = "0.53.0" version = "0.53.1"
} }
} }
} }

16
terraform/production/main.tf
View File

@@ -6,7 +6,7 @@ locals {
recursive_delete = false recursive_delete = false
} }
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" source = "github.com/18f/terraform-cloudgov//redis?ref=v0.7.1"
cf_org_name = local.cf_org_name cf_org_name = local.cf_org_name
@@ -16,6 +16,20 @@ module "redis" {
redis_plan_name = "redis-3node-large" redis_plan_name = "redis-3node-large"
} }
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 "logo_upload_bucket" { module "logo_upload_bucket" {
source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1" source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1"

4
terraform/production/providers.tf
View File

@@ -1,9 +1,9 @@
terraform { terraform {
required_version = "~> 1.0" required_version = "~> 1.7"
required_providers { required_providers {
cloudfoundry = { cloudfoundry = {
source = "cloudfoundry-community/cloudfoundry" source = "cloudfoundry-community/cloudfoundry"
version = "0.53.0" version = "0.53.1"
} }
} }

16
terraform/sandbox/main.tf
View File

@@ -6,7 +6,7 @@ locals {
recursive_delete = true recursive_delete = true
} }
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" source = "github.com/18f/terraform-cloudgov//redis?ref=v0.7.1"
cf_org_name = local.cf_org_name cf_org_name = local.cf_org_name
@@ -16,6 +16,20 @@ module "redis" {
redis_plan_name = "redis-dev" 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 "logo_upload_bucket" { module "logo_upload_bucket" {
source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1" source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1"

4
terraform/sandbox/providers.tf
View File

@@ -1,9 +1,9 @@
terraform { terraform {
required_version = "~> 1.0" required_version = "~> 1.7"
required_providers { required_providers {
cloudfoundry = { cloudfoundry = {
source = "cloudfoundry-community/cloudfoundry" source = "cloudfoundry-community/cloudfoundry"
version = "0.53.0" version = "0.53.1"
} }
} }

4
terraform/shared/container_networking/providers.tf
View File

@@ -1,9 +1,9 @@
terraform { terraform {
required_version = "~> 1.0" required_version = "~> 1.7"
required_providers { required_providers {
cloudfoundry = { cloudfoundry = {
source = "cloudfoundry-community/cloudfoundry" source = "cloudfoundry-community/cloudfoundry"
version = "0.53.0" version = "0.53.1"
} }
} }
} }

16
terraform/staging/main.tf
View File

@@ -6,7 +6,7 @@ locals {
recursive_delete = true recursive_delete = true
} }
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" source = "github.com/18f/terraform-cloudgov//redis?ref=v0.7.1"
cf_org_name = local.cf_org_name cf_org_name = local.cf_org_name
@@ -16,6 +16,20 @@ module "redis" {
redis_plan_name = "redis-dev" 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 "logo_upload_bucket" { module "logo_upload_bucket" {
source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1" source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1"

4
terraform/staging/providers.tf
View File

@@ -1,9 +1,9 @@
terraform { terraform {
required_version = "~> 1.0" required_version = "~> 1.7"
required_providers { required_providers {
cloudfoundry = { cloudfoundry = {
source = "cloudfoundry-community/cloudfoundry" source = "cloudfoundry-community/cloudfoundry"
version = "0.53.0" version = "0.53.1"
} }
} }