Update edge-node-scaledjob.yaml

Author: VietND96

charts/selenium-grid/templates/_helpers.tpl

@@ -230,46 +230,44 @@ Apply scaledOverProvisionRatio to scalingModifiers. Link with autoscaling templa
 Common autoscaling spec template
 */}}
 {{- define "seleniumGrid.autoscalingTemplate" -}}
-{{- $spec := (dict) -}}
+{{- $spec := toYaml (dict) -}}
 {{- $nodeMaxSessions := default $.Values.global.seleniumGrid.nodeMaxSessions .node.nodeMaxSessions | int64 -}}
 {{- $nodeEnableManagedDownloads := default $.Values.global.seleniumGrid.nodeEnableManagedDownloads .node.nodeEnableManagedDownloads -}}
 {{- $nodeCustomCapabilities := default $.Values.global.seleniumGrid.nodeCustomCapabilities .node.nodeCustomCapabilities -}}
 {{/* Merge with precedence from right to left */}}
 {{- with $.Values.autoscaling.scaledOptions -}}
-  {{- $spec = mergeOverwrite ($spec) . -}}
+  {{- $spec = mergeOverwrite ($spec | fromYaml) . | toYaml -}}
 {{- end -}}
 {{- with .node.scaledOptions -}}
-  {{- $spec = mergeOverwrite ($spec) . -}}
+  {{- $spec = mergeOverwrite ($spec | fromYaml) . | toYaml -}}
 {{- end -}}
 {{- if eq $.Values.autoscaling.scalingType "deployment" -}}
-  {{- $advanced := (dict "scaleTargetRef" (dict "name" .name) "advanced" (dict "horizontalPodAutoscalerConfig" (dict "name" .name))) -}}
-  {{- $advanced = mergeOverwrite $advanced (include "seleniumGrid.autoscaling.scaledOverProvisionRatio" . | fromYaml) }}
-  {{- $spec = mergeOverwrite ($spec) $advanced -}}
   {{- with $.Values.autoscaling.scaledObjectOptions -}}
-    {{- $spec = mergeOverwrite ($spec) . -}}
+    {{- $spec = mergeOverwrite ($spec | fromYaml) . | toYaml -}}
   {{- end -}}
   {{- with .node.scaledObjectOptions -}}
-    {{- $spec = mergeOverwrite ($spec) . -}}
+    {{- $spec = mergeOverwrite ($spec | fromYaml) . | toYaml -}}
   {{- end -}}
+  {{- $advanced := (dict "scaleTargetRef" (dict "name" .name) "advanced" (dict "horizontalPodAutoscalerConfig" (dict "name" .name) "restoreToOriginalReplicaCount" true)) -}}
+  {{- $advanced = mergeOverwrite $advanced (include "seleniumGrid.autoscaling.scaledOverProvisionRatio" . | fromYaml) }}
+  {{- $spec = mergeOverwrite ($spec | fromYaml) $advanced | toYaml -}}
 {{- else if eq $.Values.autoscaling.scalingType "job" -}}
-  {{- $spec = mergeOverwrite ($spec) (dict "jobTargetRef" .podTemplate) -}}
   {{- with $.Values.autoscaling.scaledJobOptions -}}
-    {{- $spec = mergeOverwrite ($spec) . -}}
+    {{- $spec = mergeOverwrite ($spec | fromYaml) . | toYaml -}}
   {{- end -}}
   {{- with .node.scaledJobOptions -}}
-    {{- $spec = mergeOverwrite ($spec) . -}}
+    {{- $spec = mergeOverwrite ($spec | fromYaml) . | toYaml -}}
   {{- end -}}
+  {{- $spec = mergeOverwrite ($spec | fromYaml) (dict "jobTargetRef" .podTemplate) | toYaml -}}
 {{- end -}}
-{{- if and $spec (not (empty $spec)) -}}
+{{- if and $spec (ne $spec "{}") -}}
   {{- $cleanSpec := dict -}}
-  {{- range $key, $value := $spec -}}
+  {{- range $key, $value := ($spec | fromYaml) -}}
     {{- if not (empty $value) -}}
       {{- $cleanSpec = set $cleanSpec $key $value -}}
     {{- end -}}
   {{- end -}}
-  {{- if not (empty $cleanSpec) -}}
-    {{- toYaml $cleanSpec | nindent 0 | trim -}}
-  {{- end -}}
+  {{ tpl ($cleanSpec | toYaml) $ }}
 {{- end -}}
 {{- if not $.Values.autoscaling.scaledOptions.triggers }}
 triggers:
@@ -299,7 +297,7 @@ triggers:
   {{- if and (eq $.Values.autoscaling.scalingType "deployment") $.Values.autoscaling.metricType }}
     metricType: {{ $.Values.autoscaling.metricType }}
   {{- end }}
-{{- end -}}
+{{- end }}
 {{- end -}}
 
 {{/*

charts/selenium-grid/templates/chrome-node-scaledjobs.yaml

@@ -26,7 +26,7 @@ spec:
   {{- $_ =  set $podScope "node" $nodeConfig -}}
   {{- $_ =  set $podScope "recorder" (mergeOverwrite $.Values.videoRecorder $nodeConfig.videoRecorder) -}}
   {{- $_ =  set $podScope "uploader" (get $.Values.videoRecorder ($podScope.recorder.uploader.name | toString)) -}}
-  {{- $_ =  set $podScope "podTemplate" (include "seleniumGrid.podTemplate" $podScope | fromYaml) -}}
+  {{- $_ =  set $podScope "podTemplate" (include "seleniumGrid.podTemplate" $podScope | fromYaml) }}
   {{- include "seleniumGrid.autoscalingTemplate" $podScope | nindent 2 }}
 ---
 {{- end }}

charts/selenium-grid/templates/edge-node-scaledjob.yaml

@@ -26,7 +26,7 @@ spec:
   {{- $_ =  set $podScope "node" $nodeConfig -}}
   {{- $_ =  set $podScope "recorder" (mergeOverwrite $.Values.videoRecorder $nodeConfig.videoRecorder) -}}
   {{- $_ =  set $podScope "uploader" (get $.Values.videoRecorder ($podScope.recorder.uploader.name | toString)) -}}
-  {{- $_ =  set $podScope "podTemplate" (include "seleniumGrid.podTemplate" $podScope | fromYaml) -}}
+  {{- $_ =  set $podScope "podTemplate" (include "seleniumGrid.podTemplate" $podScope | fromYaml) }}
   {{- include "seleniumGrid.autoscalingTemplate" $podScope | nindent 2 }}
 ---
 {{- end }}

tests/charts/templates/render/dummy.yaml

@@ -71,7 +71,6 @@ autoscaling:
       completions: 1
       activeDeadlineSeconds: 600
       backoffLimit: 6
-      template:
     pollingInterval: 30
     successfulJobsHistoryLimit: 5
     failedJobsHistoryLimit: 5