From 8be7b68fafb831d391eb0f0125d754bb86bfca11 Mon Sep 17 00:00:00 2001
From: Nawaz Dhandala <hello@nawazdhandala.com>
Date: Wed, 5 Nov 2025 16:58:07 +0000
Subject: [PATCH] fix(helm): move nodeSelector into e2e CronJob pod template
 and add per-job override

---
 HelmChart/Public/oneuptime/templates/e2e-cron.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/HelmChart/Public/oneuptime/templates/e2e-cron.yml b/HelmChart/Public/oneuptime/templates/e2e-cron.yml
index 4efb15fbd9..aa2479ffbf 100644
--- a/HelmChart/Public/oneuptime/templates/e2e-cron.yml
+++ b/HelmChart/Public/oneuptime/templates/e2e-cron.yml
@@ -15,14 +15,17 @@ metadata:
     {{- end }}
 spec:
   schedule: "*/30 * * * *" # At every 30 minute.
-  {{- if $.Values.nodeSelector }}
-  nodeSelector: {{- $.Values.nodeSelector | toYaml | nindent 8 }}
-  {{- end }}
   jobTemplate:
     spec:
       template:
         spec:
-          
+          {{- if $.Values.cronJobs.e2e.nodeSelector }}
+          nodeSelector:
+            {{- toYaml $.Values.cronJobs.e2e.nodeSelector | nindent 12 }}
+          {{- else if $.Values.nodeSelector }}
+          nodeSelector:
+            {{- toYaml $.Values.nodeSelector | nindent 12 }}
+          {{- end }}
           containers:
           - name: e2e-cron
             image: {{ include "oneuptime.image" (dict "Values" $.Values "ServiceName" "e2e") }}