From 0502eb5ebe9c6e86ed6858281360bb38bd4c750b Mon Sep 17 00:00:00 2001
From: Nawaz Dhandala <hello@nawazdhandala.com>
Date: Fri, 3 Apr 2026 14:37:12 +0100
Subject: [PATCH] fix: enforce resource request requirements for CPU and memory
 utilization thresholds in app configuration

---
 .../Public/oneuptime/templates/keda-scaledobjects.yaml | 10 +++++++++-
 HelmChart/Public/oneuptime/values.yaml                 | 10 ++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/HelmChart/Public/oneuptime/templates/keda-scaledobjects.yaml b/HelmChart/Public/oneuptime/templates/keda-scaledobjects.yaml
index e4afbdcd83..834a7f5a0a 100644
--- a/HelmChart/Public/oneuptime/templates/keda-scaledobjects.yaml
+++ b/HelmChart/Public/oneuptime/templates/keda-scaledobjects.yaml
@@ -19,6 +19,14 @@ KEDA ScaledObjects for various services
 
 {{/* App KEDA ScaledObject - scales based on combined queue size (worker + workflow + telemetry) */}}
 {{- if and .Values.keda.enabled .Values.app.enabled .Values.app.keda.enabled (not .Values.app.disableAutoscaler) (not .Values.deployment.disableDeployments) }}
+{{- $appResources := .Values.app.resources | default dict }}
+{{- $appRequests := get $appResources "requests" | default dict }}
+{{- if and (gt (int (.Values.app.keda.targetCPUUtilizationPercentage | default 0)) 0) (not (get $appRequests "cpu")) }}
+{{- fail "app.keda.targetCPUUtilizationPercentage requires app.resources.requests.cpu to be set" }}
+{{- end }}
+{{- if and (gt (int (.Values.app.keda.targetMemoryUtilizationPercentage | default 0)) 0) (not (get $appRequests "memory")) }}
+{{- fail "app.keda.targetMemoryUtilizationPercentage requires app.resources.requests.memory to be set" }}
+{{- end }}
 {{- $metricsConfig := dict "enabled" .Values.app.keda.enabled "minReplicas" .Values.app.keda.minReplicas "maxReplicas" .Values.app.keda.maxReplicas "pollingInterval" .Values.app.keda.pollingInterval "cooldownPeriod" .Values.app.keda.cooldownPeriod "targetCPUUtilizationPercentage" .Values.app.keda.targetCPUUtilizationPercentage "targetMemoryUtilizationPercentage" .Values.app.keda.targetMemoryUtilizationPercentage "triggers" (list (dict "query" "oneuptime_app_queue_size" "threshold" .Values.app.keda.queueSizeThreshold "port" .Values.app.ports.http)) }}
 {{- $appKedaArgs := dict "ServiceName" "app" "Release" .Release "Values" .Values "MetricsConfig" $metricsConfig "DisableAutoscaler" .Values.app.disableAutoscaler }}
 {{- include "oneuptime.kedaScaledObject" $appKedaArgs }}
@@ -29,4 +37,4 @@ KEDA ScaledObjects for various services
 {{- $metricsConfig := dict "enabled" .Values.aiAgent.keda.enabled "minReplicas" .Values.aiAgent.keda.minReplicas "maxReplicas" .Values.aiAgent.keda.maxReplicas "pollingInterval" .Values.aiAgent.keda.pollingInterval "cooldownPeriod" .Values.aiAgent.keda.cooldownPeriod "triggers" (list (dict "query" "oneuptime_ai_agent_queue_size" "threshold" .Values.aiAgent.keda.queueSizeThreshold "port" .Values.aiAgent.ports.http)) }}
 {{- $aiAgentKedaArgs := dict "ServiceName" "ai-agent" "Release" .Release "Values" .Values "MetricsConfig" $metricsConfig "DisableAutoscaler" .Values.aiAgent.disableAutoscaler }}
 {{- include "oneuptime.kedaScaledObject" $aiAgentKedaArgs }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/HelmChart/Public/oneuptime/values.yaml b/HelmChart/Public/oneuptime/values.yaml
index a1a604b7d2..12f4c1c859 100644
--- a/HelmChart/Public/oneuptime/values.yaml
+++ b/HelmChart/Public/oneuptime/values.yaml
@@ -669,10 +669,12 @@ app:
     maxReplicas: 100
     # Scale up when combined queue size (worker + workflow + telemetry) exceeds this threshold
     queueSizeThreshold: 10
-    # Scale up when average CPU utilization exceeds this percentage (0 to disable)
-    targetCPUUtilizationPercentage: 80
-    # Scale up when average memory utilization exceeds this percentage (0 to disable)
-    targetMemoryUtilizationPercentage: 80
+    # Scale up when average CPU utilization exceeds this percentage (0 to disable).
+    # If enabled, app.resources.requests.cpu must also be set.
+    targetCPUUtilizationPercentage: 0
+    # Scale up when average memory utilization exceeds this percentage (0 to disable).
+    # If enabled, app.resources.requests.memory must also be set.
+    targetMemoryUtilizationPercentage: 0
     # Polling interval for metrics (in seconds)
     pollingInterval: 30
     # Cooldown period after scaling (in seconds)