From 624e161292218f73c09a681887e70a0c9f3c0544 Mon Sep 17 00:00:00 2001 From: John Skiles Skinner Date: Tue, 25 Jun 2024 14:18:14 -0700 Subject: [PATCH 1/6] Upgrade cloudfoundry to v0.53.1 to match api app --- terraform/bootstrap/providers.tf | 2 +- terraform/demo/providers.tf | 2 +- terraform/development/providers.tf | 2 +- terraform/production/providers.tf | 2 +- terraform/sandbox/providers.tf | 2 +- terraform/shared/container_networking/providers.tf | 2 +- terraform/staging/providers.tf | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/terraform/bootstrap/providers.tf b/terraform/bootstrap/providers.tf index b6f27acf8..e62de0c5e 100644 --- a/terraform/bootstrap/providers.tf +++ b/terraform/bootstrap/providers.tf @@ -3,7 +3,7 @@ terraform { required_providers { cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" - version = "0.53.0" + version = "0.53.1" } } } diff --git a/terraform/demo/providers.tf b/terraform/demo/providers.tf index 2ced7915f..f69e5384b 100644 --- a/terraform/demo/providers.tf +++ b/terraform/demo/providers.tf @@ -3,7 +3,7 @@ terraform { required_providers { cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" - version = "0.53.0" + version = "0.53.1" } } diff --git a/terraform/development/providers.tf b/terraform/development/providers.tf index 5dcaece3e..3c699e728 100644 --- a/terraform/development/providers.tf +++ b/terraform/development/providers.tf @@ -3,7 +3,7 @@ terraform { required_providers { cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" - version = "0.53.0" + version = "0.53.1" } } } diff --git a/terraform/production/providers.tf b/terraform/production/providers.tf index ed822db44..99069fcc8 100644 --- a/terraform/production/providers.tf +++ b/terraform/production/providers.tf @@ -3,7 +3,7 @@ terraform { required_providers { cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" - version = "0.53.0" + version = "0.53.1" } } diff --git a/terraform/sandbox/providers.tf b/terraform/sandbox/providers.tf index 09911edc4..87c362182 100644 --- a/terraform/sandbox/providers.tf +++ b/terraform/sandbox/providers.tf @@ -3,7 +3,7 @@ terraform { required_providers { cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" - version = "0.53.0" + version = "0.53.1" } } diff --git a/terraform/shared/container_networking/providers.tf b/terraform/shared/container_networking/providers.tf index 21ac567a2..01ab1f803 100644 --- a/terraform/shared/container_networking/providers.tf +++ b/terraform/shared/container_networking/providers.tf @@ -3,7 +3,7 @@ terraform { required_providers { cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" - version = "0.53.0" + version = "0.53.1" } } } diff --git a/terraform/staging/providers.tf b/terraform/staging/providers.tf index d6928e61e..adbfaec2b 100644 --- a/terraform/staging/providers.tf +++ b/terraform/staging/providers.tf @@ -3,7 +3,7 @@ terraform { required_providers { cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" - version = "0.53.0" + version = "0.53.1" } } From 609547116618fae636f1b5a68aa9596798493cdc Mon Sep 17 00:00:00 2001 From: John Skiles Skinner Date: Tue, 25 Jun 2024 14:24:31 -0700 Subject: [PATCH 2/6] Terraform minimum version upgrade --- terraform/bootstrap/providers.tf | 2 +- terraform/demo/providers.tf | 2 +- terraform/development/providers.tf | 2 +- terraform/production/providers.tf | 2 +- terraform/sandbox/providers.tf | 2 +- terraform/staging/providers.tf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/terraform/bootstrap/providers.tf b/terraform/bootstrap/providers.tf index e62de0c5e..cce97ee8f 100644 --- a/terraform/bootstrap/providers.tf +++ b/terraform/bootstrap/providers.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.0" + required_version = "~> 1.7" required_providers { cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" diff --git a/terraform/demo/providers.tf b/terraform/demo/providers.tf index f69e5384b..2381dcd28 100644 --- a/terraform/demo/providers.tf +++ b/terraform/demo/providers.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.0" + required_version = "~> 1.7" required_providers { cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" diff --git a/terraform/development/providers.tf b/terraform/development/providers.tf index 3c699e728..7b9ce5c7f 100644 --- a/terraform/development/providers.tf +++ b/terraform/development/providers.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.0" + required_version = "~> 1.7" required_providers { cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" diff --git a/terraform/production/providers.tf b/terraform/production/providers.tf index 99069fcc8..97f543a23 100644 --- a/terraform/production/providers.tf +++ b/terraform/production/providers.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.0" + required_version = "~> 1.7" required_providers { cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" diff --git a/terraform/sandbox/providers.tf b/terraform/sandbox/providers.tf index 87c362182..978b10f45 100644 --- a/terraform/sandbox/providers.tf +++ b/terraform/sandbox/providers.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.0" + required_version = "~> 1.7" required_providers { cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" diff --git a/terraform/staging/providers.tf b/terraform/staging/providers.tf index adbfaec2b..05d8b90d3 100644 --- a/terraform/staging/providers.tf +++ b/terraform/staging/providers.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.0" + required_version = "~> 1.7" required_providers { cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" From 382c1910c91b1eadc613eba3eee5d7ff5390d936 Mon Sep 17 00:00:00 2001 From: John Skiles Skinner Date: Tue, 25 Jun 2024 14:25:32 -0700 Subject: [PATCH 3/6] Missed one --- terraform/shared/container_networking/providers.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/shared/container_networking/providers.tf b/terraform/shared/container_networking/providers.tf index 01ab1f803..dec8379ee 100644 --- a/terraform/shared/container_networking/providers.tf +++ b/terraform/shared/container_networking/providers.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.0" + required_version = "~> 1.7" required_providers { cloudfoundry = { source = "cloudfoundry-community/cloudfoundry" From 302a0f51f60f73943decca675dd8a9085742dcbd Mon Sep 17 00:00:00 2001 From: John Skiles Skinner Date: Tue, 25 Jun 2024 14:59:12 -0700 Subject: [PATCH 4/6] Redis v7 in sandbox and staging env main.tf --- terraform/sandbox/main.tf | 16 +++++++++++++++- terraform/staging/main.tf | 16 +++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/terraform/sandbox/main.tf b/terraform/sandbox/main.tf index 74c16d808..b831b44d6 100644 --- a/terraform/sandbox/main.tf +++ b/terraform/sandbox/main.tf @@ -6,7 +6,7 @@ locals { 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" cf_org_name = local.cf_org_name @@ -16,6 +16,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 "logo_upload_bucket" { source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1" diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf index d0df6e81d..b47e80029 100644 --- a/terraform/staging/main.tf +++ b/terraform/staging/main.tf @@ -6,7 +6,7 @@ locals { 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" cf_org_name = local.cf_org_name @@ -16,6 +16,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 "logo_upload_bucket" { source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1" From 73b42b4abfefc8f3a87c152b958c4466b73f2512 Mon Sep 17 00:00:00 2001 From: John Skiles Skinner Date: Tue, 25 Jun 2024 15:05:58 -0700 Subject: [PATCH 5/6] Same new resource in Demo and Production envs --- terraform/demo/main.tf | 16 +++++++++++++++- terraform/production/main.tf | 16 +++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/terraform/demo/main.tf b/terraform/demo/main.tf index 7f34fb0f1..545871d4a 100644 --- a/terraform/demo/main.tf +++ b/terraform/demo/main.tf @@ -6,7 +6,7 @@ locals { 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" cf_org_name = local.cf_org_name @@ -16,6 +16,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 "logo_upload_bucket" { source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1" diff --git a/terraform/production/main.tf b/terraform/production/main.tf index 450212cdf..75721dd34 100644 --- a/terraform/production/main.tf +++ b/terraform/production/main.tf @@ -6,7 +6,7 @@ locals { 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" cf_org_name = local.cf_org_name @@ -16,6 +16,20 @@ module "redis" { 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" { source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1" From f591ef21fc9186bb8baed89eb9c717e60ca7f336 Mon Sep 17 00:00:00 2001 From: John Skiles Skinner Date: Tue, 25 Jun 2024 15:19:49 -0700 Subject: [PATCH 6/6] Upgrade tj-actions from v41 to v44 --- .github/workflows/deploy-demo.yml | 4 ++-- .github/workflows/deploy-prod.yml | 4 ++-- .github/workflows/deploy.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy-demo.yml b/.github/workflows/deploy-demo.yml index dc725f157..a8adfa918 100644 --- a/.github/workflows/deploy-demo.yml +++ b/.github/workflows/deploy-demo.yml @@ -18,7 +18,7 @@ jobs: - name: Check for changes to Terraform id: changed-terraform-files - uses: tj-actions/changed-files@v41.0.0 + uses: tj-actions/changed-files@v44 with: files: | terraform/demo @@ -88,7 +88,7 @@ jobs: - name: Check for changes to egress config id: changed-egress-config - uses: tj-actions/changed-files@v41.0.0 + uses: tj-actions/changed-files@v44 with: files: | deploy-config/egress_proxy/notify-admin-demo.*.acl diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index d614bf309..940e11faf 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -18,7 +18,7 @@ jobs: - name: Check for changes to Terraform id: changed-terraform-files - uses: tj-actions/changed-files@v41.0.0 + uses: tj-actions/changed-files@v44 with: files: | terraform/production @@ -88,7 +88,7 @@ jobs: - name: Check for changes to egress config id: changed-egress-config - uses: tj-actions/changed-files@v41.0.0 + uses: tj-actions/changed-files@v44 with: files: | deploy-config/egress_proxy/notify-admin-production.*.acl diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d74ba3133..f3b6133a4 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -23,7 +23,7 @@ jobs: - name: Check for changes to Terraform id: changed-terraform-files - uses: tj-actions/changed-files@v41.0.0 + uses: tj-actions/changed-files@v44 with: files: | terraform/staging @@ -95,7 +95,7 @@ jobs: - name: Check for changes to egress config id: changed-egress-config - uses: tj-actions/changed-files@v41.0.0 + uses: tj-actions/changed-files@v44 with: files: | deploy-config/egress_proxy/notify-admin-staging.*.acl