Add global affinity and tolerations to jobs (#119)

quickwit-oss · Jan 13, 2025 · 050a222 · 050a222
1 parent 35dd5e1
commit 050a222
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/charts/quickwit/Chart.yaml b/charts/quickwit/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: quickwit
 description: Sub-second search & analytics engine on cloud storage.
 type: application
-version: 0.7.8
+version: 0.7.9
 appVersion: "v0.8.2"
 keywords:
   - quickwit

diff --git a/charts/quickwit/templates/job-create-indices.yaml b/charts/quickwit/templates/job-create-indices.yaml
@@ -90,14 +90,13 @@ spec:
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with $.Values.bootstrap.affinity }}
+      {{- with merge $.Values.affinity $.Values.bootstrap.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with $.Values.bootstrap.tolerations }}
+      {{- $tolerations := append .Values.tolerations .Values.bootstrap.tolerations | compact | uniq }}
       tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
+        {{- toYaml $tolerations | nindent 8 }}
       {{- if $.Values.bootstrap.runtimeClassName }}
       runtimeClassName: {{ $.Values.bootstrap.runtimeClassName | quote }}
       {{- end }}

diff --git a/charts/quickwit/templates/job-create-sources.yaml b/charts/quickwit/templates/job-create-sources.yaml
@@ -92,14 +92,13 @@ spec:
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with $.Values.bootstrap.affinity }}
+      {{- with merge $.Values.affinity $.Values.bootstrap.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with $.Values.bootstrap.tolerations }}
+      {{- $tolerations := append .Values.tolerations .Values.bootstrap.tolerations | compact | uniq }}
       tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
+        {{- toYaml $tolerations | nindent 8 }}
       {{- if $.Values.bootstrap.runtimeClassName }}
       runtimeClassName: {{ $.Values.bootstrap.runtimeClassName | quote }}
       {{- end }}