From 07e59d0ba908f02ca81a3cd4f08d56a816614c78 Mon Sep 17 00:00:00 2001
From: Rhea Danzey <rdanzey@element.io>
Date: Fri, 20 Sep 2024 13:56:27 -0500
Subject: [PATCH] =?UTF-8?q?Helm=20Chart=20-=20Add=20configuration=20for=20?=
 =?UTF-8?q?node=20selector=20/=20tolerations=20/=20affi=E2=80=A6=20(#3433)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For some experimentation I'm doing, I need to pin Dendrite to a specific
node pool. This should be available configuration within the chart
ideally, and this should do it in theory.

### Pull Request Checklist

<!-- Please read
https://matrix-org.github.io/dendrite/development/contributing before
submitting your pull request -->

* [x] I have added Go unit tests or [Complement integration
tests](https://github.com/matrix-org/complement) for this PR _or_ I have
justified why this PR doesn't need tests
* [x] Pull request includes a [sign off below using a legally
identifiable
name](https://matrix-org.github.io/dendrite/development/contributing#sign-off)
_or_ I have already signed off privately

Signed-off-by: `Rhea Danzey <rdanzey@element.io>`

---------

Signed-off-by: Rhea Danzey <rdanzey@element.io>
---
 helm/dendrite/Chart.yaml                |  2 +-
 helm/dendrite/templates/deployment.yaml | 15 +++++++++++++++
 helm/dendrite/templates/jobs.yaml       | 12 ++++++++++++
 helm/dendrite/values.yaml               | 12 ++++++++++++
 4 files changed, 40 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..3952f4a7c 100644
--- a/helm/dendrite/templates/deployment.yaml
+++ b/helm/dendrite/templates/deployment.yaml
@@ -56,6 +56,9 @@ spec:
         args:
           - '--config'
           - '/etc/dendrite/dendrite.yaml'
+        {{- with .Values.extraArgs }}
+        {{- toYaml . | nindent 10 }}
+        {{- end }}
         ports:
           - name: http
             containerPort: 8008
@@ -113,4 +116,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..02cd1aa13 100644
--- a/helm/dendrite/values.yaml
+++ b/helm/dendrite/values.yaml
@@ -77,6 +77,9 @@ persistence:
     #   GKE, AWS & OpenStack)
     storageClass:
 
+# -- Add additional arguments to the dendrite command
+extraArgs: []
+
 # -- Add additional volumes to the Dendrite Pod
 extraVolumes: []
 # ex.
@@ -100,6 +103,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: