only check the volumes mounted in the cronjob for podAffinity

{{cookiecutter.project_slug}}/templates/{{cookiecutter.template_base_name}}/helpers/cronjobs/_spec.tpl

@@ -10,14 +10,14 @@
 {%- raw %}
 {{- /* due to scoping we need to use a dict for requiredPodAffinity and override the value if necessary */}}
 {{- $requiredPodAffinity := dict "isRequired" false }}
-{{- $builtinVolumes := include "{% endraw %}{{ cookiecutter.template_base_name }}{% raw %}.builtinVolumes" . | fromYaml }}
-{{- $allVolumes := mustMergeOverwrite (dict) $builtinVolumes .Values.volumes }}
-{{- range $name, $options := $allVolumes }}
-  {{- /* Check the necessity of podAffinity */}}
-  {{- if and (not $options.projected) (hasKey $options "accessModes") }}
-    {{- range $options.accessModes }}
-      {{- if eq . "ReadWriteOnce" }}
-        {{- $_ := set $requiredPodAffinity "isRequired" true }}
+{{- if .volumes }}
+  {{- range $name, $options := .volumes }}
+    {{- /* Check the necessity of podAffinity */}}
+    {{- if and (not $options.projected) (hasKey $options "accessModes") }}
+      {{- range $options.accessModes }}
+        {{- if eq . "ReadWriteOnce" }}
+          {{- $_ := set $requiredPodAffinity "isRequired" true }}
+        {{- end }}
       {{- end }}
     {{- end }}
   {{- end }}
@@ -33,7 +33,6 @@ jobTemplate:
           parent: {%raw %}{{ .name | quote }}{% endraw %}
       spec:
         {%- if cookiecutter.__include_volume != 'no' %}
-        {%- raw %}{{- if .volumes }}{%- endraw %}
         affinity:
           podAffinity:
             requiredDuringSchedulingIgnoredDuringExecution:
@@ -44,7 +43,6 @@ jobTemplate:
                     {{ "{{-" }} include "{{ cookiecutter.template_base_name }}.selectorLabels" $ | nindent 20 {{ "}}" }}
                 topologyKey: kubernetes.io/hostname
               {% raw %}{{- end }}{% endraw %}
-        {%- raw %}{{- end }}{%- endraw %}
         {%- endif %}
         containers:
           - name: {%raw %}{{ .name | quote }}{% endraw %}