From 4d91c6e810b3647f874a5e65016bf4bd2784fe32 Mon Sep 17 00:00:00 2001 From: manuraf Date: Wed, 10 Apr 2024 11:25:47 +0200 Subject: [PATCH] Container App Environment name var --- infra/container_apps/README.md | 1 + infra/container_apps/env/uat-pnpg/terraform.tfvars | 6 ++++-- infra/container_apps/env/uat/terraform.tfvars | 10 ++++++---- infra/container_apps/locals.tf | 2 +- infra/container_apps/variables.tf | 6 ++++++ 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/infra/container_apps/README.md b/infra/container_apps/README.md index 5b4b8c80..d336e3da 100644 --- a/infra/container_apps/README.md +++ b/infra/container_apps/README.md @@ -35,6 +35,7 @@ Deploy container on a Container App instance. |------|-------------|------|---------|:--------:| | [api\_dns\_zone\_prefix](#input\_api\_dns\_zone\_prefix) | The dns subdomain. | `string` | `"api.selfcare"` | no | | [app\_settings](#input\_app\_settings) | n/a |
list(object({
name = string
value = string
}))
| n/a | yes | +| [cae\_name](#input\_cae\_name) | Container App Environment name | `string` | `"cae-cp"` | no | | [container\_app](#input\_container\_app) | Container App configuration |
object({
min_replicas = number
max_replicas = number

scale_rules = list(object({
name = string
custom = object({
metadata = map(string)
type = string
})
}))

cpu = number
memory = string
})
| n/a | yes | | [dns\_zone\_prefix](#input\_dns\_zone\_prefix) | The dns subdomain. | `string` | `"selfcare"` | no | | [env\_short](#input\_env\_short) | Environment short name | `string` | n/a | yes | diff --git a/infra/container_apps/env/uat-pnpg/terraform.tfvars b/infra/container_apps/env/uat-pnpg/terraform.tfvars index e4c6f8aa..e8a1539f 100644 --- a/infra/container_apps/env/uat-pnpg/terraform.tfvars +++ b/infra/container_apps/env/uat-pnpg/terraform.tfvars @@ -1,5 +1,7 @@ -is_pnpg = true -env_short = "u" +is_pnpg = true +env_short = "u" +cae_name = "cae" +workload_profile_name = "Consumption" tags = { CreatedBy = "Terraform" diff --git a/infra/container_apps/env/uat/terraform.tfvars b/infra/container_apps/env/uat/terraform.tfvars index 4c25e510..d66db786 100644 --- a/infra/container_apps/env/uat/terraform.tfvars +++ b/infra/container_apps/env/uat/terraform.tfvars @@ -1,7 +1,9 @@ -env_short = "u" -private_dns_name = "selc-u-party-reg-proxy-ca.agreeablesky-f71e6306.westeurope.azurecontainerapps.io" -dns_zone_prefix = "uat.selfcare" -api_dns_zone_prefix = "api.uat.selfcare" +env_short = "u" +private_dns_name = "selc-u-party-reg-proxy-ca.agreeablesky-f71e6306.westeurope.azurecontainerapps.io" +dns_zone_prefix = "uat.selfcare" +api_dns_zone_prefix = "api.uat.selfcare" +cae_name = "cae" +workload_profile_name = "Consumption" tags = { CreatedBy = "Terraform" diff --git a/infra/container_apps/locals.tf b/infra/container_apps/locals.tf index 9082c05f..919eaef8 100644 --- a/infra/container_apps/locals.tf +++ b/infra/container_apps/locals.tf @@ -2,5 +2,5 @@ locals { pnpg_suffix = var.is_pnpg == true ? "-pnpg" : "" project = "selc-${var.env_short}" - container_app_environment_name = "${local.project}${local.pnpg_suffix}-cae-cp" + container_app_environment_name = "${local.project}${local.pnpg_suffix}-${var.cae_name}" } \ No newline at end of file diff --git a/infra/container_apps/variables.tf b/infra/container_apps/variables.tf index 75f83674..cb360313 100644 --- a/infra/container_apps/variables.tf +++ b/infra/container_apps/variables.tf @@ -85,3 +85,9 @@ variable "workload_profile_name" { description = "Workload Profile name to use" default = null } + +variable "cae_name" { + type = string + description = "Container App Environment name" + default = "cae-cp" +}