Bring back workload profile name

Author: pamelafox

docs/deploy_private.md

@@ -32,7 +32,7 @@ If you want to disable public access when deploying the Chat App, you can do so
 Deploying with public access disabled adds additional cost to your deployment. Please see pricing for the following products:
 
 * [Azure Container Registry](https://azure.microsoft.com/pricing/details/container-registry/): Premium tier is used when virtual network is added (required for private links), which incurs additional costs.
-* [Azure Container Apps](https://azure.microsoft.com/pricing/details/container-apps/): Workload profiles environment is used when virtual network is added (required for private links), which incurs additional costs. Additionally, min replica count is set to 1, so you will be charged for at least one instance. If you need to customize the environment configuration further, edit the container-apps-environment.bicep file.
+* [Azure Container Apps](https://azure.microsoft.com/pricing/details/container-apps/): Workload profiles environment is used when virtual network is added (required for private links), which incurs additional costs. Additionally, min replica count is set to 1, so you will be charged for at least one instance.
 * [VPN Gateway](https://azure.microsoft.com/pricing/details/vpn-gateway/): VpnGw2 SKU. Pricing includes a base monthly cost plus an hourly cost based on the number of connections.
 * [Virtual Network](https://azure.microsoft.com/pricing/details/virtual-network/): Pay-as-you-go tier. Costs based on data processed.
 

infra/core/host/container-apps-environment.bicep

@@ -10,6 +10,15 @@ param subnetResourceId string
 
 param usePrivateIngress bool = true
 
+@allowed(['Consumption', 'D4', 'D8', 'D16', 'D32', 'E4', 'E8', 'E16', 'E32', 'NC24-A100', 'NC48-A100', 'NC96-A100'])
+param workloadProfile string
+
+// Make sure that we are using a non-consumption workload profile for private endpoints
+var finalWorkloadProfile = (usePrivateIngress && workloadProfile == 'Consumption') ? 'D4' : workloadProfile
+
+var minimumCount = usePrivateIngress ? 1 : 0
+var maximumCount = usePrivateIngress ? 3 : 2
+
 resource containerAppsEnvironment 'Microsoft.App/managedEnvironments@2025-02-02-preview' = {
   name: name
   location: location
@@ -37,12 +46,17 @@ resource containerAppsEnvironment 'Microsoft.App/managedEnvironments@2025-02-02-
       }
       {
         name: 'Warm'
-        workloadProfileType: 'D4'
-        minimumCount: 1
-        maximumCount: 3
+        workloadProfileType: finalWorkloadProfile
+        minimumCount: minimumCount
+        maximumCount: maximumCount
+      }
+    ]
+    : [
+      {
+        name: 'Consumption'
+        workloadProfileType: 'Consumption'
       }
     ]
-    : []
   }
 }
 

infra/core/host/container-apps.bicep

@@ -9,8 +9,9 @@ param applicationInsightsName string = ''
 
 @description('Virtual network name for container apps environment.')
 param vnetName string = ''
-@description('Subnet name for container apps environment integration.')
-param subnetName string = ''
+
+@allowed(['Consumption', 'D4', 'D8', 'D16', 'D32', 'E4', 'E8', 'E16', 'E32', 'NC24-A100', 'NC48-A100', 'NC96-A100'])
+param workloadProfile string
 
 param subnetResourceId string = ''
 
@@ -26,6 +27,7 @@ module containerAppsEnvironment 'container-apps-environment.bicep' = {
     applicationInsightsName: applicationInsightsName
     usePrivateIngress: usePrivateIngress
     subnetResourceId: subnetResourceId
+    workloadProfile: workloadProfile
   }
 }
 

infra/main.bicep

@@ -297,6 +297,9 @@ param runningOnAdo string = ''
 @description('Used by azd for containerapps deployment')
 param webAppExists bool
 
+@allowed(['Consumption', 'D4', 'D8', 'D16', 'D32', 'E4', 'E8', 'E16', 'E32', 'NC24-A100', 'NC48-A100', 'NC96-A100'])
+param azureContainerAppsWorkloadProfile string
+
 @allowed(['appservice', 'containerapps'])
 param deploymentTarget string = 'appservice'
 param acaIdentityName string = deploymentTarget == 'containerapps' ? '${environmentName}-aca-identity' : ''
@@ -530,6 +533,7 @@ module containerApps 'core/host/container-apps.bicep' = if (deploymentTarget ==
     logAnalyticsWorkspaceName: useApplicationInsights ? monitoring.outputs.logAnalyticsWorkspaceName : ''
     subnetResourceId: usePrivateEndpoint ? isolation.outputs.appSubnetId : ''
     usePrivateIngress: usePrivateEndpoint
+    workloadProfile: azureContainerAppsWorkloadProfile
   }
 }
 

infra/main.parameters.json

@@ -344,6 +344,9 @@
     "webAppExists": {
         "value": "${SERVICE_WEB_RESOURCE_EXISTS=false}"
     },
+    "azureContainerAppsWorkloadProfile": {
+      "value": "${AZURE_CONTAINER_APPS_WORKLOAD_PROFILE=Consumption}"
+    },
     "useMediaDescriberAzureCU": {
       "value": "${USE_MEDIA_DESCRIBER_AZURE_CU=false}"
     },