darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-06 04:48:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3041 from GSA/terraform_upgrade6

Browse Source 
set up module.redis-v70 for upgrade
This commit is contained in:
ccostino
2025-10-22 15:57:23 -04:00
committed by GitHub
parent e885542bf3 f5c2c392a7
commit f5f15662da
2 changed files with 25 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,15 +38,15 @@ jobs:
run: terraform init run: terraform init
# - name: Terraform see if we can destroy a specific module - name: Terraform see if we can destroy a specific module
# working-directory: terraform/staging working-directory: terraform/staging
# env: env:
# AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }} AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }}
# AWS_SECRET_ACCESS_KEY: ${{ secrets.TERRAFORM_STATE_SECRET_ACCESS_KEY }} AWS_SECRET_ACCESS_KEY: ${{ secrets.TERRAFORM_STATE_SECRET_ACCESS_KEY }}
# TF_VAR_cf_user: ${{ secrets.CLOUDGOV_USERNAME }} TF_VAR_cf_user: ${{ secrets.CLOUDGOV_USERNAME }}
# TF_VAR_cf_password: ${{ secrets.CLOUDGOV_PASSWORD }} TF_VAR_cf_password: ${{ secrets.CLOUDGOV_PASSWORD }}
# run: | run: |
# terraform plan -destroy -target=module.logo_upload_bucket terraform plan -destroy -target=module.redis-v70
- name: Terraform apply - name: Terraform apply

39
terraform/staging/main.tf
View File

@@ -12,19 +12,22 @@ resource "null_resource" "prevent_destroy" {
} }
} }
module "redis-v70" { # module "redis-v70" {
source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v1.0.0" # source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.4.0"
# Right now the default is cfcommunity, remove this when default is cloudfoundry
cf_org_name = local.cf_org_name # providers = {
cf_space_name = local.cf_space_name # cloudfoundry = cloudfoundry.official
name = "${local.app_name}-redis-v70-${local.env}" # }
redis_plan_name = "redis-dev" # org = data.cloudfoundry_space.space.org
json_params = jsonencode( # cf_space_id = data.cloudfoundry_space.space.id
{ # name = "${local.app_name}-redis-v70-${local.env}"
"engineVersion" : "7.0", # redis_plan_name = "redis-dev"
} # json_params = jsonencode(
) # {
} # "engineVersion" : "7.0",
# }
# )
# }
data "cloudfoundry_space" "space" { data "cloudfoundry_space" "space" {
provider = cloudfoundry.official provider = cloudfoundry.official
@@ -43,16 +46,6 @@ module "logo_upload_bucket" {
} }
# This is the old form which used cfcommunity as a provider
# module "logo_upload_bucket_old" {
# source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v1.0.0"
# cf_org_name = local.cf_org_name
# cf_space_name = local.cf_space_name
# name = "${local.app_name}-logo-upload-bucket-${local.env}"
# }
module "api_network_route" { module "api_network_route" {
source = "../shared/container_networking" source = "../shared/container_networking"