pub/charts
1
0
Fork 0
Code Issues Pull requests Releases Packages 19 Activity Actions

Merge branch 'master' into 'master'

Browse source 
Various fixes for matrix-synapse chart

See merge request ananace/charts!11
This commit is contained in:
Alexander Olofsson 2021-06-23 18:21:33 +00:00
commit dcca547376
4 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
charts/matrix-synapse/templates/deployment.yaml
View file

@ -95,7 +95,7 @@ spec:
key: redis-password key: redis-password
{{- end }} {{- end }}
{{- with .Values.synapse.extraEnv }} {{- with .Values.synapse.extraEnv }}
{{ . | toYaml }} {{- . | toYaml | nindent 12 }}
{{- end }} {{- end }}
image: "{{ .Values.image.repository }}:{{ include "matrix-synapse.imageTag" . }}" image: "{{ .Values.image.repository }}:{{ include "matrix-synapse.imageTag" . }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
@ -159,7 +159,7 @@ spec:
- name: media - name: media
{{- $mediaworker := false }} {{- $mediaworker := false }}
{{- range $worker, $config := .Values.workers }} {{- range $worker, $config := .Values.workers }}
{{- if eq $worker "media-repository" }} {{- if eq $worker "media_repository" }}
{{- $mediaworker = true }} {{- $mediaworker = true }}
{{- end }} {{- end }}
{{- end }} {{- end }}

5
charts/matrix-synapse/templates/ingress.yaml
View file

@ -16,6 +16,9 @@ metadata:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
{{- if .Values.ingress.className }}
ingressClassName: {{ .Values.ingress.className }}
{{- end }}
{{- if .Values.ingress.tls }} {{- if .Values.ingress.tls }}
tls: tls:
{{- range .Values.ingress.tls }} {{- range .Values.ingress.tls }}
@ -23,7 +26,9 @@ spec:
{{- range .hosts }} {{- range .hosts }}
- {{ . | quote }} - {{ . | quote }}
{{- end }} {{- end }}
{{- if .secretName }}
secretName: {{ .secretName }} secretName: {{ .secretName }}
{{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}
rules: rules:

9
charts/matrix-synapse/templates/worker-deployment.yaml
View file

@ -33,10 +33,7 @@ spec:
{{ . | toYaml | nindent 8 }} {{ . | toYaml | nindent 8 }}
{{- end }} {{- end }}
spec: spec:
{{- with $.Values.imagePullSecrets }} {{- include "matrix-synapse.imagePullSecrets" $ | nindent 6 }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
securityContext: securityContext:
{{- $config.podSecurityContext | default $default.podSecurityContext | toYaml | nindent 8 }} {{- $config.podSecurityContext | default $default.podSecurityContext | toYaml | nindent 8 }}
{{- if and $needsVolumePermissions (eq $name "media-repository") }} {{- if and $needsVolumePermissions (eq $name "media-repository") }}
@ -47,7 +44,7 @@ spec:
imagePullPolicy: {{ $.Values.volumePermissions.pullPolicy }} imagePullPolicy: {{ $.Values.volumePermissions.pullPolicy }}
securityContext: securityContext:
runAsUser: 0 runAsUser: 0
resources: {{ $.Values.volumePermissions.resources | toYaml | nindent 10 }} resources: {{ $.Values.volumePermissions.resources | toYaml | nindent 12 }}
volumeMounts: volumeMounts:
- name: media - name: media
mountPath: /synapse/data mountPath: /synapse/data
@ -83,7 +80,7 @@ spec:
key: redis-password key: redis-password
{{- end }} {{- end }}
{{- with $config.extraEnv | default $default.extraEnv }} {{- with $config.extraEnv | default $default.extraEnv }}
{{ . | toYaml }} {{- . | toYaml | nindent 12 }}
{{- end }} {{- end }}
securityContext: securityContext:
{{- $config.securityContext | default $default.securityContext | toYaml | nindent 12 }} {{- $config.securityContext | default $default.securityContext | toYaml | nindent 12 }}

8
charts/matrix-synapse/values.yaml
View file

@ -158,7 +158,7 @@ synapse:
## Additional environment variables to apply to the main Synapse pod ## Additional environment variables to apply to the main Synapse pod
## ##
extraEnv: {} extraEnv: []
# - name: LD_PRELOAD # - name: LD_PRELOAD
# value: /usr/lib/x86_64-linux-gnu/libjemalloc.so.2 # value: /usr/lib/x86_64-linux-gnu/libjemalloc.so.2
# - name: SYNAPSE_CACHE_FACTOR # - name: SYNAPSE_CACHE_FACTOR
@ -262,7 +262,7 @@ workers:
## Additional environment variables to add to the worker. ## Additional environment variables to add to the worker.
## ##
extraEnv: {} extraEnv: []
# - name: LD_PRELOAD # - name: LD_PRELOAD
# value: /usr/lib/x86_64-linux-gnu/libjemalloc.so.2 # value: /usr/lib/x86_64-linux-gnu/libjemalloc.so.2
# - name: SYNAPSE_CACHE_FACTOR # - name: SYNAPSE_CACHE_FACTOR
@ -713,3 +713,7 @@ ingress:
# hosts: # hosts:
# - example.com # - example.com
# - matrix.example.com # - matrix.example.com
## Set the name of the IngressClass cluster resource (optional)
## https://kubernetes.io/docs/reference/kubernetes-api/service-resources/ingress-v1/#IngressSpec
#className: can-be-anything