Make affinity in charts more generic

bakdata · May 15, 2024 · 3d67d3d · 3d67d3d
1 parent f3c0aa9
commit 3d67d3d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/charts/producer-app-cleanup-job/templates/job.yaml b/charts/producer-app-cleanup-job/templates/job.yaml
@@ -38,22 +38,19 @@ spec:
       serviceAccountName: {{ .Values.serviceAccountName }}
       {{- end }}
       {{- if .Values.tolerations }}
-      tolerations:
-{{ toYaml .Values.tolerations | indent 8 }}
+      tolerations: {{ toYaml .Values.tolerations | nindent 8 }}
       {{- end }}
       {{- with .Values.affinity }}
       affinity: {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- if .Values.imagePullSecrets }}
-      imagePullSecrets:
-{{- toYaml .Values.imagePullSecrets | nindent 8 }}
+      imagePullSecrets: {{- toYaml .Values.imagePullSecrets | nindent 8 }}
       {{- end }}
       containers:
         - name: {{ template "producer-app-cleanup-job.name" . }}
           image: "{{ .Values.image }}:{{ .Values.imageTag }}"
           imagePullPolicy: "{{ .Values.imagePullPolicy }}"
-          resources:
-{{ toYaml .Values.resources | indent 12 }}
+          resources: {{ toYaml .Values.resources | nindent 12 }}
           env:
             - name: ENV_PREFIX
               value: {{ .Values.configurationEnvPrefix }}_

diff --git a/charts/producer-app/templates/pod.yaml b/charts/producer-app/templates/pod.yaml
@@ -21,22 +21,19 @@ spec:
   serviceAccountName: {{ .Values.serviceAccountName }}
   {{- end }}
   {{- if .Values.tolerations }}
-  tolerations:
-{{ toYaml .Values.tolerations | indent 4 }}
+  tolerations: {{ toYaml .Values.tolerations | nindent 4 }}
   {{- end }}
   {{- with .Values.affinity }}
   affinity: {{- toYaml . | nindent 4 }}
   {{- end }}
   {{- if .Values.imagePullSecrets }}
-  imagePullSecrets:
-{{- toYaml .Values.imagePullSecrets | nindent 8 }}
+  imagePullSecrets: {{- toYaml .Values.imagePullSecrets | nindent 4 }}
   {{- end }}
   containers:
   - name: {{ template "producer-app.name" . }}
     image: "{{ .Values.image }}:{{ .Values.imageTag }}"
     imagePullPolicy: "{{ .Values.imagePullPolicy }}"
-    resources:
-{{ toYaml .Values.resources | indent 6 }}
+    resources: {{ toYaml .Values.resources | nindent 6 }}
     env:
       - name: ENV_PREFIX
         value: {{ .Values.configurationEnvPrefix }}_

diff --git a/charts/streams-app-cleanup-job/templates/job.yaml b/charts/streams-app-cleanup-job/templates/job.yaml
@@ -50,7 +50,7 @@ spec:
         - name: {{ template "streams-app-cleanup-job.name" . }}
           image: "{{ .Values.image }}:{{ .Values.imageTag }}"
           imagePullPolicy: "{{ .Values.imagePullPolicy }}"
-          resources: {{ toYaml .Values.resources | indent 12 }}
+          resources: {{ toYaml .Values.resources | nindent 12 }}
           env:
             - name: ENV_PREFIX
               value: {{ .Values.configurationEnvPrefix }}_