一些更新

matrix/dendrite/templates/_helpers.tpl

@@ -1,6 +1,6 @@
 {{- define "validate.config" }}
 {{- if and (not .Values.signing_key.create) (eq .Values.signing_key.existingSecret "") -}}
-{{-  fail "You must create a signing key for configuration.signing_key OR specify an existing secret name in .Values.signing_key.existingSecret to mount it. (see https://github.com/matrix-org/dendrite/blob/master/docs/INSTALL.md#server-key-generation)" -}}
+{{-  fail "You must create a signing key for configuration.signing_key OR specify an existing secret name in .Values.signing_key.existingSecret to mount it. (see https://github.com/element-hq/dendrite/blob/master/docs/INSTALL.md#server-key-generation)" -}}
 {{- end -}}
 {{- if and (not .Values.postgresql.enabled) (eq .Values.dendrite_config.global.database.connection_string "") -}}
 {{-  fail "Database connection string must be set." -}}
@@ -65,4 +65,4 @@ Selector labels
 {{- define "dendrite.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "dendrite.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
+{{- end }}

matrix/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
@@ -65,9 +68,6 @@ spec:
           - name: PPROFLISTEN
             value: "localhost:{{- $.Values.dendrite_config.global.profiling.port -}}"
         {{- end }}
-        env:
-          - name: HTTPS_PROXY
-            value: "socks5://proxy:1080"
         resources:
         {{- toYaml $.Values.resources | nindent 10 }}
         volumeMounts:
@@ -113,3 +113,19 @@ spec:
           httpGet:
             path: /_dendrite/monitor/up
             port: http
+      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 }}

matrix/dendrite/templates/jobs.yaml

@@ -54,11 +54,15 @@ metadata:
 spec:
   template:
     spec:
+      imagePullSecrets:
+      {{- with .Values.imagePullSecrets }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
       restartPolicy: "Never"
       serviceAccount: {{ $name }}
       containers:
       - name: upload-key
-        image: {{ $.Values.image.kubectl }}
+        image: bitnami/kubectl
         command:
         - sh
         - -c
@@ -94,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