fix(instant-chart): ensure CronJob renders correctly when the ‘starti…

…ngDeadlineSeconds’ field is missing
phe-lab · Nov 25, 2024 · 0baf89f · 0baf89f
1 parent 6ce8ea4
commit 0baf89f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/charts/instant-chart/Chart.yaml b/charts/instant-chart/Chart.yaml
@@ -9,7 +9,7 @@ keywords:
   - general
   - phelab
 type: application
-version: 0.5.1
+version: 0.5.2
 dependencies:
   - name: common
     version: 2.20.5

diff --git a/charts/instant-chart/templates/cronjob.yaml b/charts/instant-chart/templates/cronjob.yaml
@@ -29,7 +29,12 @@ spec:
       labels:
         {{- include "instant-chart.labels" . | nindent 8 }}
     spec:
-      {{- omit .Values.cronJob "schedule" "timeZone" "concurrencyPolicy" "startingDeadlineSeconds" | toYaml | nindent 6 }}
+      {{- $defaultValues := dict "schedule" nil "timeZone" nil "concurrencyPolicy" nil "startingDeadlineSeconds" nil -}}
+      {{- $job := merge $defaultValues .Values.cronJob -}}
+      {{- $job = omit $job "schedule" "timeZone" "concurrencyPolicy" "startingDeadlineSeconds" -}}
+      {{- with $job -}}
+      {{- . | toYaml | nindent 6 }}
+      {{- end }}
       template:
         {{- include "instant-chart.podTemplate" . | nindent 8 }}
 {{- end }}

diff --git a/charts/instant-chart/values.schema.json b/charts/instant-chart/values.schema.json
@@ -728,8 +728,7 @@
       "title": "Pod restart policy",
       "description": "Restart policy for all containers within the pod",
       "type": "string",
-      "enum": ["Always", "OnFailure", "Never", ""],
-      "default": "OnFailure"
+      "enum": ["Always", "OnFailure", "Never", ""]
     },
     "imagePatches": {
       "additionalProperties": {