From 7d93506bd932b3b6df770796acdf6e81f0243ec0 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@nico-notebook.schottelius.org>
Date: Sat, 17 Jul 2021 22:48:48 +0200
Subject: [PATCH] Always pull the ungleich-matrix-synapse image

---
 apps/matrix/templates/deployment.yaml | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/apps/matrix/templates/deployment.yaml b/apps/matrix/templates/deployment.yaml
index cf5a63a..fdd3bd5 100644
--- a/apps/matrix/templates/deployment.yaml
+++ b/apps/matrix/templates/deployment.yaml
@@ -15,17 +15,9 @@ spec:
         use-as-service: {{ .Release.Name }}
     spec:
       initContainers:
-        # - name: wait-for-cert
-        #   image: busybox
-        #   command:
-        #     - sh
-        #     - -c
-        #     - until ls /etc/letsencrypt/live/{{ tpl .Values.fqdn . }}/fullchain.pem; do sleep 2; done
-        #   volumeMounts:
-        #     - name: etcletsencrypt
-        #       mountPath: "/etc/letsencrypt"
         - name: generate-matrix-signing-key
           image: ungleich/ungleich-matrix-synapse:{{ .Values.synapseVersion }}
+          imagePullPolicy: Always
           command:
             - "python"
             - "-m"
@@ -43,6 +35,7 @@ spec:
       containers:
         - name: certbot
           image: ungleich/ungleich-certbot
+          imagePullPolicy: Always
           ports:
             - containerPort: 80
           env:
@@ -54,9 +47,9 @@ spec:
           - name: STAGING
             value: "no"
           {{ end }}
-        volumeMounts:
-          - name: etcletsencrypt
-            mountPath: "/etc/letsencrypt"
+          volumeMounts:
+            - name: etcletsencrypt
+              mountPath: "/etc/letsencrypt"
         # This container will only start *after* the cert has been placed
         - name: debug
           image: alpine:latest
@@ -331,7 +324,7 @@ data:
         cp_min: 10
         cp_min: 5
 
-    log_config: "/config/log.yaml"
+    log_config: "/baseconfig/log.yaml"
 
     enable_media_repo: true
     media_store_path: "/data/media"