fix: DTOSS-9699 Add workload_profile to container apps (#1174)

* Add workload_profile to container apps

* Update template refs

* Add CAE subnet delegation

* Consolidate changes across environments

Author: rfk-nc

.azuredevops/pipelines/cd-infrastructure-dev-core.yaml

@@ -13,7 +13,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 2041f050215b170eef2853e78e010c2a949a9bae
+      ref: e4e68ea29c4fab7014caf900063fe70f785732f3
       endpoint: NHSDigital
 
 variables:

.azuredevops/pipelines/cd-infrastructure-int-core.yaml

@@ -13,7 +13,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 2041f050215b170eef2853e78e010c2a949a9bae
+      ref: e4e68ea29c4fab7014caf900063fe70f785732f3
       endpoint: NHSDigital
 
 variables:

.azuredevops/pipelines/cd-infrastructure-nft-core.yaml

@@ -13,7 +13,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 2041f050215b170eef2853e78e010c2a949a9bae
+      ref: e4e68ea29c4fab7014caf900063fe70f785732f3
       endpoint: NHSDigital
 
 variables:

infrastructure/tf-core/container_app_environment.tf

@@ -14,6 +14,7 @@ module "container-app-environment" {
 
   log_analytics_workspace_id = data.terraform_remote_state.audit.outputs.log_analytics_workspace_id[local.primary_region]
   vnet_integration_subnet_id = module.subnets["${module.regions_config[each.value.region].names.subnet}-container-app-${lower(each.value.container_app_environment)}"].id
+  workload_profile           = each.value.workload_profile
   zone_redundancy_enabled    = each.value.zone_redundancy_enabled
 }
 

infrastructure/tf-core/environments/development.tfvars

@@ -51,6 +51,9 @@ regions = {
       container-app-db-management = {
         cidr_newbits = 7
         cidr_offset  = 6
+        delegation_name            = "Microsoft.App/environments"
+        service_delegation_name    = "Microsoft.App/environments"
+        service_delegation_actions = ["Microsoft.Network/virtualNetworks/subnets/action"]
       }
     }
   }

infrastructure/tf-core/environments/integration.tfvars

@@ -11,6 +11,7 @@ features = {
   public_network_access_enabled        = false
 }
 
+# these will be merged with compliance tags in locals.tf
 tags = {
   Environment = "integration"
 }
@@ -50,6 +51,9 @@ regions = {
       container-app-db-management = {
         cidr_newbits = 7
         cidr_offset  = 6
+        delegation_name            = "Microsoft.App/environments"
+        service_delegation_name    = "Microsoft.App/environments"
+        service_delegation_actions = ["Microsoft.Network/virtualNetworks/subnets/action"]
       }
     }
   }
@@ -1097,6 +1101,7 @@ function_apps = {
         AcceptableLatencyThresholdMs = "500"
       }
     }
+
     ReferenceDataService = {
       name_suffix            = "reference-data-service"
       function_endpoint_name = "ReferenceDataService"

infrastructure/tf-core/environments/nft.tfvars

@@ -11,6 +11,7 @@ features = {
   public_network_access_enabled        = false
 }
 
+# these will be merged with compliance tags in locals.tf
 tags = {
   Environment = "non-functional testing"
 }
@@ -47,9 +48,12 @@ regions = {
         cidr_newbits = 8
         cidr_offset  = 5
       }
-      container-app-db-management-4 = {
+      container-app-db-management = {
         cidr_newbits = 7
         cidr_offset  = 6
+        delegation_name            = "Microsoft.App/environments"
+        service_delegation_name    = "Microsoft.App/environments"
+        service_delegation_actions = ["Microsoft.Network/virtualNetworks/subnets/action"]
       }
     }
   }
@@ -144,13 +148,6 @@ app_service_plan = {
           capacity_min = "1"
           capacity_max = "4"
           capacity_def = "2"
-
-          inc_threshold   = 5
-          dec_threshold   = 5
-          inc_scale_value = 2
-
-          dec_scale_type  = "ChangeCount"
-          dec_scale_value = 1
         }
       }
     }
@@ -195,16 +192,16 @@ app_service_plan = {
 
 container_app_environments = {
   instances = {
-    db-management-4 = {
+    db-management = {
       zone_redundancy_enabled = false
     }
   }
 }
 
 container_app_jobs = {
   apps = {
-    db-management-4 = {
-      container_app_environment_key = "db-management-4"
+    db-management = {
+      container_app_environment_key = "db-management"
       docker_env_tag                = "nft"
       docker_image                  = "cohort-manager-db-migration"
       container_registry_use_mi     = true
@@ -1100,6 +1097,7 @@ function_apps = {
         AcceptableLatencyThresholdMs = "500"
       }
     }
+
     ReferenceDataService = {
       name_suffix            = "reference-data-service"
       function_endpoint_name = "ReferenceDataService"

infrastructure/tf-core/variables.tf

@@ -161,6 +161,12 @@ variable "container_app_environments" {
   default     = {}
   type = object({
     instances = optional(map(object({
+      workload_profile = optional(object({
+        name                  = optional(string)
+        workload_profile_type = optional(string)
+        minimum_count         = optional(number, 0)
+        maximum_count         = optional(string, 1)
+      }), {})
       zone_redundancy_enabled = optional(bool, false)
     })), {})
   })