Adds Container App health probes and configurable settings

Integrates liveness, readiness, and startup probes; externalizes replica counts, CPU, memory, container registry, and tags as variables; restructures identity and registry blocks; renames registry variable.

Author: Keboo

Infra/modules/container_app/main.tf

@@ -10,27 +10,41 @@ resource "azurerm_container_app" "app" {
   resource_group_name          = var.resource_group_name
   revision_mode                = "Single"
   workload_profile_name        = "Consumption"
+  tags                         = var.tags
+
+  identity {
+    type         = "UserAssigned"
+    identity_ids = [var.identity_id]
+  }
+
+  registry {
+    server   = var.container_registry_login_server
+    identity = var.identity_id
+  }
 
   template {
-    min_replicas = 0
-    max_replicas = 1
+    min_replicas = var.min_replicas
+    max_replicas = var.max_replicas
 
     container {
       name = var.name
-      // NOTE: Initial container image will be replaced by azure pipelines deploy
-      image  = "${var.registry_server}/crccheck/hello-world:latest"
-      cpu    = "0.5"
-      memory = "1Gi"
+      image  = "${var.container_registry_login_server}/crccheck/hello-world:latest"
+      cpu    = var.cpu
+      memory = var.memory
 
       env {
-        # Port for crccheck/hello-world to listen on
         name  = "PORT"
         value = "8080"
       }
 
       env {
         name  = "ASPNETCORE_HTTP_PORTS"
-        value = "8080"
+        value = "8080;8081"
+      }
+
+      env {
+        name  = "HEALTH_PORT"
+        value = "8081"
       }
 
       dynamic "env" {
@@ -40,32 +54,46 @@ resource "azurerm_container_app" "app" {
           value = env.value
         }
       }
-    }
-  }
 
-  identity {
-    type         = "UserAssigned"
-    identity_ids = [var.identity_id]
+      liveness_probe {
+        path             = "/alive"
+        port             = 8081
+        transport        = "HTTP"
+        initial_delay    = 10
+        interval_seconds = 30
+      }
+
+      readiness_probe {
+        path             = "/alive"
+        port             = 8081
+        transport        = "HTTP"
+        interval_seconds = 10
+      }
+
+      startup_probe {
+        path                    = "/health"
+        port                    = 8081
+        transport               = "HTTP"
+        interval_seconds        = 5
+        failure_count_threshold = 15 # 5 * 15 = 75 seconds
+      }
+    }
   }
 
   ingress {
     external_enabled = true
     target_port      = 8080
+    transport        = "auto"
 
     traffic_weight {
       percentage      = 100
       latest_revision = true
     }
   }
 
-  registry {
-    server   = var.registry_server
-    identity = var.identity_id
-  }
-
   lifecycle {
     ignore_changes = [
-      template[0].container[0].image
+      template[0].container[0].image,
     ]
   }
 }

Infra/modules/container_app/variables.tf

@@ -7,24 +7,53 @@ variable "resource_group_name" {
   description = "Name of the resource group"
   type        = string
 }
+variable "identity_id" {
+  description = "The resource ID of the user-assigned managed identity."
+  type        = string
+}
 
 variable "container_app_environment_id" {
   description = "ID of the Container App Environment"
   type        = string
 }
 
-variable "env_vars" {
-  description = "Environment variables for the container"
-  type        = map(string)
-  default     = {}
+variable "container_registry_login_server" {
+  description = "Container registry server"
+  type        = string
 }
 
-variable "identity_id" {
-  description = "Resource ID of the User Assigned Identity"
-  type        = string
+variable "cpu" {
+  description = "CPU cores allocated to the container (e.g. 0.5, 1.0)."
+  type        = number
+  default     = 0.5
 }
 
-variable "registry_server" {
-  description = "Container registry server"
+variable "memory" {
+  description = "Memory allocated to the container (e.g. 1Gi)."
   type        = string
+  default     = "1Gi"
+}
+
+variable "min_replicas" {
+  description = "Minimum number of replicas."
+  type        = number
+  default     = 0
+}
+
+variable "max_replicas" {
+  description = "Maximum number of replicas."
+  type        = number
+  default     = 1
+}
+
+variable "env_vars" {
+  description = "Map of environment variables for the container."
+  type        = map(string)
+  default     = {}
+}
+
+variable "tags" {
+  description = "Tags to apply to all resources"
+  type        = map(string)
+  default     = {}
 }

Infra/modules/container_app_environment/variables.tf

@@ -6,12 +6,6 @@ variable "resource_group" {
   })
 }
 
-variable "tags" {
-  description = "Tags to apply to all resources"
-  type        = map(string)
-  default     = {}
-}
-
 variable "container_app_environment_name" {
   description = "Environment variables for the container app"
   type        = string
@@ -20,4 +14,10 @@ variable "container_app_environment_name" {
 variable "identity_id" {
   description = "ID of the managed identity"
   type        = string
+}
+
+variable "tags" {
+  description = "Tags to apply to all resources"
+  type        = map(string)
+  default     = {}
 }

Infra/modules/container_registry/outputs.tf

@@ -1,7 +1,9 @@
 output "container_registry_id" {
-  value = azurerm_container_registry.acr.id
+  description = "The ID of the container registry."
+  value       = azurerm_container_registry.acr.id
 }
 
 output "login_server" {
-  value = azurerm_container_registry.acr.login_server
-}
+  description = "The login server URL of the container registry."
+  value       = azurerm_container_registry.acr.login_server
+}

Infra/modules/container_registry/variables.tf

@@ -7,7 +7,7 @@ variable "resource_group" {
 }
 
 variable "name" {
-  description = "Name of the container registry"
+  description = "The name of the container registry. Must be globally unique, alphanumeric only."
   type        = string
 }
 
@@ -22,7 +22,7 @@ variable "push_identity_ids" {
 }
 
 variable "sku" {
-  description = "The SKU of the container registry"
+  description = "The SKU of the container registry (Basic, Standard, Premium)."
   type        = string
   default     = "Basic"
 }
@@ -31,4 +31,4 @@ variable "tags" {
   description = "Tags to apply to all resources"
   type        = map(string)
   default     = {}
-}
+}

Infra/prod/main.tf

@@ -44,11 +44,11 @@ module "container_app_environment" {
 module "backend_container_app" {
   source = "../modules/container_app"
 
-  name                         = "reactapp-${lower(local.environment)}-backend"
-  container_app_environment_id = module.container_app_environment.container_app_environment_id
-  resource_group_name          = azurerm_resource_group.resource_group.name
-  identity_id                  = azurerm_user_assigned_identity.app_identity.id
-  registry_server              = var.acr_login_server
+  name                            = "reactapp-${lower(local.environment)}-backend"
+  container_app_environment_id    = module.container_app_environment.container_app_environment_id
+  resource_group_name             = azurerm_resource_group.resource_group.name
+  identity_id                     = azurerm_user_assigned_identity.app_identity.id
+  container_registry_login_server = var.acr_login_server
 
   env_vars = {
     # Run EF Core migrations on startup for Azure deployments