Skip to content

Commit 71a3c0d

Browse files
Merge pull request #741 from NHSDigital/DTOSS-11652-enable-zone-redundancy-prod-container-apps-environemnt
[DTOSS-11652] - feat(infra): enable zone redundancy for Container App Environment in Production
2 parents bebe7f0 + 50ddfe9 commit 71a3c0d

File tree

5 files changed

+23
-9
lines changed

5 files changed

+23
-9
lines changed

infrastructure/environments/prod/variables.tfvars

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ nhs_notify_api_message_batch_url = "https://api.service.nhs.uk/comms/v1/mes
1212
allowed_paths = ["/notifications/message-status/create"]
1313
enable_alerting = true
1414
use_apex_domain = true
15+
cae_zone_redundancy_enabled = true

infrastructure/modules/infra/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ module "container-app-environment" {
6666
log_analytics_workspace_id = module.log_analytics_workspace_audit.id
6767
vnet_integration_subnet_id = module.container_app_subnet.id
6868
private_dns_zone_rg_name = "rg-hub-${var.hub}-uks-private-dns-zones"
69+
zone_redundancy_enabled = var.cae_zone_redundancy_enabled
6970
}
7071

7172
module "app_insights_audit" {

infrastructure/modules/infra/variables.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@ variable "infra_key_vault_rg" {
4343
type = string
4444
}
4545

46+
variable "cae_zone_redundancy_enabled" {
47+
description = "Specifies whether the Container App Environment should be zone redundant."
48+
type = bool
49+
}
50+
4651
locals {
4752
hub_vnet_rg_name = "rg-hub-${var.hub}-uks-hub-networking"
4853
}

infrastructure/terraform/main.tf

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,16 @@ module "infra" {
88
azurerm.hub = azurerm.hub
99
}
1010

11-
region = local.region
12-
resource_group_name = local.resource_group_name
13-
infra_key_vault_name = local.infra_key_vault_name
14-
infra_key_vault_rg = local.infra_key_vault_rg
15-
app_short_name = var.app_short_name
16-
environment = var.env_config
17-
hub = var.hub
18-
protect_keyvault = var.protect_keyvault
19-
vnet_address_space = var.vnet_address_space
11+
region = local.region
12+
resource_group_name = local.resource_group_name
13+
infra_key_vault_name = local.infra_key_vault_name
14+
infra_key_vault_rg = local.infra_key_vault_rg
15+
app_short_name = var.app_short_name
16+
environment = var.env_config
17+
hub = var.hub
18+
protect_keyvault = var.protect_keyvault
19+
vnet_address_space = var.vnet_address_space
20+
cae_zone_redundancy_enabled = var.cae_zone_redundancy_enabled
2021
}
2122

2223
module "shared_config" {

infrastructure/terraform/variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,12 @@ variable "enable_entra_id_authentication" {
117117
default = false
118118
}
119119

120+
variable "cae_zone_redundancy_enabled" {
121+
description = "Specifies whether the Container App Environment should be zone redundant."
122+
type = bool
123+
default = false
124+
}
125+
120126
variable "use_apex_domain" {
121127
description = "Use apex domain for the Front Door endpoint. Set to true for production."
122128
type = bool

0 commit comments

Comments
 (0)