From d5bcf3cd905539cef2002fd4ff9152e5c45853a5 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@nico-notebook.schottelius.org>
Date: Fri, 11 Mar 2022 08:49:12 +0100
Subject: [PATCH] Update apps/matrix

---
 apps/matrix/templates/element-web.yaml | 16 +++++++++++++++-
 apps/matrix/templates/postgres.yaml    |  8 ++++----
 apps/matrix/templates/synapse.yaml     | 14 ++++++++++++++
 apps/matrix/values.yaml                | 21 +++++++++++++++++++--
 generic/nginx-test-deployment.yaml     |  2 +-
 5 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/apps/matrix/templates/element-web.yaml b/apps/matrix/templates/element-web.yaml
index d9318f4..ce149a4 100644
--- a/apps/matrix/templates/element-web.yaml
+++ b/apps/matrix/templates/element-web.yaml
@@ -23,7 +23,7 @@ spec:
     spec:
       containers:
         - name: nginx
-          image: ungleich/ungleich-certbot:1.1.1
+          image: ungleich/ungleich-certbot:1.1.3
           ports:
             - containerPort: 443
               name: https
@@ -43,6 +43,13 @@ spec:
               mountPath: "/nginx-configs"
             - name: etcletsencrypt
               mountPath: "/etc/letsencrypt"
+          resources:
+            requests:
+              memory: {{ .Values.resources.elementnginx.memory }}
+              cpu: {{ .Values.resources.elementnginx.cpu }}
+            limits:
+              memory: {{ .Values.resources.elementnginx.memory }}
+              cpu: {{ .Values.resources.elementnginx.cpu }}
         - name: element-web
           command: ["nginx", "-g", "daemon off;" ]
           image: vectorim/element-web:{{ .Values.elementWebVersion }}
@@ -54,6 +61,13 @@ spec:
             - name: elementwebconfig
               mountPath: "/usr/share/nginx/html/config.json"
               subPath: config.json
+          resources:
+            requests:
+              memory: {{ .Values.resources.element.memory }}
+              cpu: {{ .Values.resources.element.cpu }}
+            limits:
+              memory: {{ .Values.resources.element.memory }}
+              cpu: {{ .Values.resources.element.cpu }}
       volumes:
         - name: nginx-config
           configMap:
diff --git a/apps/matrix/templates/postgres.yaml b/apps/matrix/templates/postgres.yaml
index 451fb37..1be5f30 100644
--- a/apps/matrix/templates/postgres.yaml
+++ b/apps/matrix/templates/postgres.yaml
@@ -34,11 +34,11 @@ spec:
               subPath: postgres
           resources:
             requests:
-              memory: "64Mi"
-              cpu: "100m"
+              memory: {{.Values.resources.postgres.memory }}
+              cpu: {{.Values.resources.postgres.cpu}}
             limits:
-              memory: "256Mi"
-              cpu: "400m"
+              memory: {{.Values.resources.postgres.memory}}
+              cpu: {{.Values.resources.postgres.cpu}}
       volumes:
         - name: postgres-data
           persistentVolumeClaim:
diff --git a/apps/matrix/templates/synapse.yaml b/apps/matrix/templates/synapse.yaml
index 0e7f42e..42f02c4 100644
--- a/apps/matrix/templates/synapse.yaml
+++ b/apps/matrix/templates/synapse.yaml
@@ -58,6 +58,13 @@ spec:
               mountPath: "/nginx-configs"
             - name: etcletsencrypt
               mountPath: "/etc/letsencrypt"
+          resources:
+            requests:
+              memory: {{ .Values.resources.synapsenginx.memory }}
+              cpu: {{ .Values.resources.synapsenginx.cpu }}
+            limits:
+              memory: {{ .Values.resources.synapsenginx.memory }}
+              cpu: {{ .Values.resources.synapsenginx.cpu }}
         - name: synapse
           image: matrixdotorg/synapse:{{ .Values.synapseVersion }}
           command:
@@ -81,6 +88,13 @@ spec:
               mountPath: "/data"
             - name: synapse-conf
               mountPath: "/config-ro"
+          resources:
+            requests:
+              memory: {{.Values.resources.synapse.memory }}
+              cpu: {{.Values.resources.synapse.cpu}}
+            limits:
+              memory: {{.Values.resources.synapse.memory}}
+              cpu: {{.Values.resources.synapse.cpu}}
       volumes:
         - name: etcletsencrypt
           persistentVolumeClaim:
diff --git a/apps/matrix/values.yaml b/apps/matrix/values.yaml
index dc04271..8223b9d 100644
--- a/apps/matrix/values.yaml
+++ b/apps/matrix/values.yaml
@@ -7,8 +7,8 @@ enable_registration: false
 # Maximum size of one particular file
 max_filesize_in_mb: 100
 
-elementWebVersion: "v1.9.8"
-synapseVersion: "v1.49.2"
+elementWebVersion: "v1.10.4"
+synapseVersion: "v1.53.0"
 
 elementWebFQDN: "{{ .Release.Name }}-element-web.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}"
 synapseFQDN: "{{ .Release.Name }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}"
@@ -27,3 +27,20 @@ storage:
   letsencrypt:
     size: 50Mi
     storageClass: rook-ceph-block-hdd
+
+resources:
+  postgres:
+    memory: "512Mi"
+    cpu: "400m"
+  elementnginx:
+    memory: "64Mi"
+    cpu: "100m"
+  synapsenginx:
+    memory: "64Mi"
+    cpu: "200m"
+  element:
+    memory: "128Mi"
+    cpu: "100m"
+  synapse:
+    memory: "1024Mi"
+    cpu: "400m"
diff --git a/generic/nginx-test-deployment.yaml b/generic/nginx-test-deployment.yaml
index f93243e..df9b02b 100644
--- a/generic/nginx-test-deployment.yaml
+++ b/generic/nginx-test-deployment.yaml
@@ -6,7 +6,7 @@ spec:
   selector:
     matchLabels:
       app: nginx
-  replicas: 2 # tells deployment to run 2 pods matching the template
+  replicas: 6
   template:
     metadata:
       labels: