reuse admin parameters for job

Author: kvaps

deploy/helm/kubernetes/templates/kubeadm-job.yaml

@@ -7,39 +7,39 @@ metadata:
   name: "{{ $fullName }}-kubeadm-tasks"
   labels:
     app: "{{ $fullName }}-kubeadm-tasks"
-    {{- with .Values.admin.job.labels }}
+    {{- with .Values.admin.labels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
   annotations:
     helm.sh/hook: post-install,post-upgrade
     helm.sh/hook-delete-policy: before-hook-creation
     checksum/config: {{ include (print $.Template.BasePath "/kubeadm-config.yaml") . | sha256sum }}
     checksum/scripts: {{ include (print $.Template.BasePath "/kubeadm-scripts.yaml") . | sha256sum }}
-    {{- with .Values.admin.job.annotations }}
+    {{- with .Values.admin.annotations }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
   template:
     metadata:
       labels:
         app: "{{ $fullName }}-kubeadm-tasks"
-        {{- with .Values.admin.job.podLabels }}
+        {{- with .Values.admin.podLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
-      {{- with .Values.admin.job.podAnnotations }}
+      {{- with .Values.admin.podAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
     spec:
-      {{- with .Values.admin.job.nodeSelector }}
+      {{- with .Values.admin.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.admin.job.tolerations }}
+      {{- with .Values.admin.tolerations }}
       tolerations:
       {{- toYaml . | nindent 6 }}
       {{- end }}
-      {{- with .Values.admin.job.affinity }}
+      {{- with .Values.admin.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
@@ -59,7 +59,7 @@ spec:
         env:
         - name: KUBECONFIG
           value: "/etc/kubernetes/admin.conf"
-        {{- with .Values.admin.job.extraEnv }}
+        {{- with .Values.admin.extraEnv }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
         volumeMounts:

deploy/helm/kubernetes/templates/kubeadm-scripts.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.admin.job.enabled }}
+{{- if or .Values.admin.enabled .Values.admin.job.enabled }}
 {{- $fullName := include "kubernetes.fullname" . -}}
 ---
 apiVersion: v1

deploy/helm/kubernetes/values.yaml

@@ -199,6 +199,12 @@ admin:
     #   cpu: 100m
     #   memory: 128Mi
 
+  job:
+    enabled: true
+    schedule: "0 0 1 */6 *"
+    successfulJobsHistoryLimit: 3
+    failedJobsHistoryLimit: 3
+
   labels: {}
   annotations: {}
   podLabels: {}
@@ -211,20 +217,6 @@ admin:
   extraVolumes: []
   extraVolumeMounts: []
 
-  job:
-    enabled: true
-    schedule: "0 0 1 */6 *"
-    successfulJobsHistoryLimit: 3
-    failedJobsHistoryLimit: 3
-    labels: {}
-    annotations: {}
-    podLabels: {}
-    podAnnotations: {}
-    nodeSelector: {}
-    tolerations: []
-    affinity: {}
-    extraEnv: []
-
 kubeProxy:
   enabled: true