Skip to content

Commit

Permalink
Helm Chart - Add configuration for node selector / tolerations / affi… (
Browse files Browse the repository at this point in the history
#3433)

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>
  • Loading branch information
Arkaniad authored Sep 20, 2024
1 parent c914f06 commit 07e59d0
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 1 deletion.
2 changes: 1 addition & 1 deletion helm/dendrite/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
15 changes: 15 additions & 0 deletions helm/dendrite/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ spec:
args:
- '--config'
- '/etc/dendrite/dendrite.yaml'
{{- with .Values.extraArgs }}
{{- toYaml . | nindent 10 }}
{{- end }}
ports:
- name: http
containerPort: 8008
Expand Down Expand Up @@ -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 }}
12 changes: 12 additions & 0 deletions helm/dendrite/templates/jobs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 12 additions & 0 deletions helm/dendrite/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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:
Expand Down

0 comments on commit 07e59d0

Please sign in to comment.