From 3c67ac35ffc0b242a1d22656e8f3cbe6cf36efab Mon Sep 17 00:00:00 2001
From: Rhea Danzey <rdanzey@element.io>
Date: Fri, 20 Sep 2024 13:02:40 -0500
Subject: [PATCH] Helm Chart - Add configuration for node selector /
 tolerations / affinity

Signed-off-by: Rhea Danzey <rdanzey@element.io>
---
 helm/dendrite/Chart.yaml                |  2 +-
 helm/dendrite/templates/deployment.yaml | 12 ++++++++++++
 helm/dendrite/templates/jobs.yaml       | 12 ++++++++++++
 helm/dendrite/values.yaml               |  9 +++++++++
 4 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/helm/dendrite/Chart.yaml b/helm/dendrite/Chart.yaml
index 7893f9bdc..9613b5045 100644
--- a/helm/dendrite/Chart.yaml
+++ b/helm/dendrite/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: dendrite
-version: "0.14.5"
+version: "0.14.6"
 appVersion: "0.13.8"
 description: Dendrite Matrix Homeserver
 type: application
diff --git a/helm/dendrite/templates/deployment.yaml b/helm/dendrite/templates/deployment.yaml
index 6496b2692..718f6457b 100644
--- a/helm/dendrite/templates/deployment.yaml
+++ b/helm/dendrite/templates/deployment.yaml
@@ -113,4 +113,16 @@ spec:
       imagePullSecrets:
       {{- with .Values.imagePullSecrets }}
       {{ . | toYaml | nindent 6 }}
+      {{- end }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
       {{- end }}
\ No newline at end of file
diff --git a/helm/dendrite/templates/jobs.yaml b/helm/dendrite/templates/jobs.yaml
index 42582d749..7f96f2695 100644
--- a/helm/dendrite/templates/jobs.yaml
+++ b/helm/dendrite/templates/jobs.yaml
@@ -98,6 +98,18 @@ spec:
       volumes:
       - name: signing-key
         emptyDir: {}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
   parallelism: 1
   completions: 1
   backoffLimit: 1
diff --git a/helm/dendrite/values.yaml b/helm/dendrite/values.yaml
index f9d82965a..b68d9c182 100644
--- a/helm/dendrite/values.yaml
+++ b/helm/dendrite/values.yaml
@@ -100,6 +100,15 @@ strategy:
     # -- Maximum number of pods that can be scheduled above the desired number of pods
     maxSurge: 25%
 
+# -- Node selector configuration
+nodeSelector: {}
+
+# -- Tolerations configuration
+tolerations: {}
+
+# -- Affinity configuration
+affinity: {}
+
 dendrite_config:
   version: 2
   global: