DTOSS-11646: Add a startup probe and PR fixes

Author: mrlockstar

infrastructure/modules/container-app/main.tf

@@ -104,17 +104,29 @@ resource "azurerm_container_app" "main" {
         }
       }
 
+      dynamic "startup_probe" {
+        for_each = local.probe_enabled ? [1] : []
+
+        content {
+          transport               = "HTTP"
+          path                    = var.probe_path
+          port                    = var.port
+          interval_seconds        = 5
+          timeout                 = 2
+          failure_count_threshold = 30
+        }
+      }
+
       dynamic "liveness_probe" {
         for_each = local.probe_enabled ? [1] : []
 
         content {
           transport               = "HTTP"
           path                    = var.probe_path
-          port                    = local.effective_liveness_port
-          initial_delay           = 45
-          interval_seconds        = 10
+          port                    = var.port
+          interval_seconds        = 5
           timeout                 = 2
-          failure_count_threshold = 4
+          failure_count_threshold = 2
         }
       }
     }

infrastructure/modules/container-app/variables.tf

@@ -93,12 +93,6 @@ variable "exposed_port" {
   default     = null
 }
 
-variable "liveness_probe_port" {
-  description = "Port for the liveness probe to check. Default is var.port."
-  type        = number
-  default     = null
-}
-
 variable "memory" {
   description = "Memory allocated to the app (GiB). Also dictates the CPU allocation: CPU(%)=MEMORY(Gi)/2. Maximum: 4Gi"
   default     = "0.5"
@@ -197,7 +191,7 @@ variable "replica_restart_alert_threshold" {
 }
 
 variable "probe_path" {
-  description = "Path for the liveness probe. If null, liveness probe is disabled."
+  description = "Path for the HTTP health probe. If null, HTTP health probe is disabled. Note /healthcheck is the normal convention."
   type        = string
   default     = null
 }
@@ -214,7 +208,6 @@ locals {
     PT6H  = "PT5M"
     PT12H = "PT5M"
   }
-  alert_frequency         = local.alert_frequency_map[var.alert_window_size]
-  probe_enabled           = var.probe_path != null
-  effective_liveness_port = var.liveness_probe_port != null ? var.liveness_probe_port : var.port
+  alert_frequency = local.alert_frequency_map[var.alert_window_size]
+  probe_enabled   = var.probe_path != null && var.is_web_app
 }