From a73592b25d1cabe7a98789ce508ecb025cd4c3b2 Mon Sep 17 00:00:00 2001
From: AvivGuiser <avivguiser@gmail.com>
Date: Mon, 13 Jan 2025 15:08:09 +0200
Subject: [PATCH] only add annotations stanza in scalejob if they are
 annotations we want to add

Signed-off-by: AvivGuiser <avivguiser@gmail.com>
---
 charts/selenium-grid/templates/chrome-node-scaledjobs.yaml | 2 ++
 charts/selenium-grid/templates/edge-node-scaledjob.yaml    | 2 ++
 charts/selenium-grid/templates/firefox-node-scaledjob.yaml | 2 ++
 charts/selenium-grid/templates/relay-node-scaledjobs.yaml  | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/charts/selenium-grid/templates/chrome-node-scaledjobs.yaml b/charts/selenium-grid/templates/chrome-node-scaledjobs.yaml
index 5c83971167..3024c16b8e 100644
--- a/charts/selenium-grid/templates/chrome-node-scaledjobs.yaml
+++ b/charts/selenium-grid/templates/chrome-node-scaledjobs.yaml
@@ -6,10 +6,12 @@ kind: ScaledJob
 metadata:
   name: {{ template "seleniumGrid.chromeNode.fullname" (list $nodeConfig $) }}
   namespace: {{ $.Release.Namespace }}
+  {{- if $.Values.autoscaling.annotations }}
   annotations:
     {{- with $.Values.autoscaling.annotations }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
+  {{- end }}
   labels:
     app: {{ template "seleniumGrid.chromeNode.fullname" (list $nodeConfig $) }}
     app.kubernetes.io/name: {{ template "seleniumGrid.chromeNode.fullname" (list $nodeConfig $) }}
diff --git a/charts/selenium-grid/templates/edge-node-scaledjob.yaml b/charts/selenium-grid/templates/edge-node-scaledjob.yaml
index 82942f3744..164d8d7946 100644
--- a/charts/selenium-grid/templates/edge-node-scaledjob.yaml
+++ b/charts/selenium-grid/templates/edge-node-scaledjob.yaml
@@ -6,10 +6,12 @@ kind: ScaledJob
 metadata:
   name: {{ template "seleniumGrid.edgeNode.fullname" (list $nodeConfig $) }}
   namespace: {{ $.Release.Namespace }}
+  {{- if $.Values.autoscaling.annotations }}
   annotations:
     {{- with $.Values.autoscaling.annotations }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
+  {{- end }}
   labels:
     app: {{ template "seleniumGrid.edgeNode.fullname" (list $nodeConfig $) }}
     app.kubernetes.io/name: {{ template "seleniumGrid.edgeNode.fullname" (list $nodeConfig $) }}
diff --git a/charts/selenium-grid/templates/firefox-node-scaledjob.yaml b/charts/selenium-grid/templates/firefox-node-scaledjob.yaml
index f83e5173ee..b1bed800de 100644
--- a/charts/selenium-grid/templates/firefox-node-scaledjob.yaml
+++ b/charts/selenium-grid/templates/firefox-node-scaledjob.yaml
@@ -6,10 +6,12 @@ kind: ScaledJob
 metadata:
   name: {{ template "seleniumGrid.firefoxNode.fullname" (list $nodeConfig $) }}
   namespace: {{ $.Release.Namespace }}
+  {{- if $.Values.autoscaling.annotations }}
   annotations:
     {{- with $.Values.autoscaling.annotations }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
+  {{- end }}
   labels:
     app: {{ template "seleniumGrid.firefoxNode.fullname" (list $nodeConfig $) }}
     app.kubernetes.io/name: {{ template "seleniumGrid.firefoxNode.fullname" (list $nodeConfig $) }}
diff --git a/charts/selenium-grid/templates/relay-node-scaledjobs.yaml b/charts/selenium-grid/templates/relay-node-scaledjobs.yaml
index 2ff6a7057d..eec44d8eff 100644
--- a/charts/selenium-grid/templates/relay-node-scaledjobs.yaml
+++ b/charts/selenium-grid/templates/relay-node-scaledjobs.yaml
@@ -6,10 +6,12 @@ kind: ScaledJob
 metadata:
   name: {{ template "seleniumGrid.relayNode.fullname" (list $nodeConfig $) }}
   namespace: {{ $.Release.Namespace }}
+  {{- if $.Values.autoscaling.annotations }}
   annotations:
     {{- with $.Values.autoscaling.annotations }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
+  {{- end }}
   labels:
     app: {{ template "seleniumGrid.relayNode.fullname" (list $nodeConfig $) }}
     app.kubernetes.io/name: {{ template "seleniumGrid.relayNode.fullname" (list $nodeConfig $) }}