Merge branch 'master' into 'master'

Various fixes for matrix-synapse chart

See merge request ananace/charts!11

charts/matrix-synapse/templates/deployment.yaml

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

charts/matrix-synapse/templates/ingress.yaml

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

charts/matrix-synapse/templates/worker-deployment.yaml

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

charts/matrix-synapse/values.yaml

@@ -158,7 +158,7 @@ synapse:
 
   ## Additional environment variables to apply to the main Synapse pod
   ##
-  extraEnv: {}
+  extraEnv: []
   #  - name: LD_PRELOAD
   #    value: /usr/lib/x86_64-linux-gnu/libjemalloc.so.2
   #  - name: SYNAPSE_CACHE_FACTOR
@@ -262,7 +262,7 @@ workers:
 
     ## Additional environment variables to add to the worker.
     ##
-    extraEnv: {}
+    extraEnv: []
     #  - name: LD_PRELOAD
     #    value: /usr/lib/x86_64-linux-gnu/libjemalloc.so.2
     #  - name: SYNAPSE_CACHE_FACTOR
@@ -713,3 +713,7 @@ ingress:
   #    hosts:
   #      - 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