From a05b870142d3d7e0e04b9d4ef97fbaad6c34bd72 Mon Sep 17 00:00:00 2001
From: Alexander Olofsson <alexander.olofsson@liu.se>
Date: Fri, 14 Aug 2020 10:42:14 +0200
Subject: [PATCH] matrix-synapse: Slight template improvements

Fixes overly eager worker restart, uses the correct label for
application component for well-known server
---
 charts/matrix-synapse/Chart.yaml                       |  2 +-
 charts/matrix-synapse/templates/well-known.yaml        | 10 +++++-----
 charts/matrix-synapse/templates/worker-deployment.yaml |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/charts/matrix-synapse/Chart.yaml b/charts/matrix-synapse/Chart.yaml
index 21b8551..76715db 100644
--- a/charts/matrix-synapse/Chart.yaml
+++ b/charts/matrix-synapse/Chart.yaml
@@ -6,7 +6,7 @@ icon: https://matrix.org/images/matrix-logo.svg
 appVersion: 1.18.0
 
 type: application
-version: 1.0.1
+version: 1.0.2
 maintainers:
   - name: Alexander Olofsson
     email: ace@haxalot.com
diff --git a/charts/matrix-synapse/templates/well-known.yaml b/charts/matrix-synapse/templates/well-known.yaml
index 9ef5ecc..2d4e4b6 100644
--- a/charts/matrix-synapse/templates/well-known.yaml
+++ b/charts/matrix-synapse/templates/well-known.yaml
@@ -7,7 +7,7 @@ metadata:
   name: {{ $wkName }}
   labels:
     {{- include "matrix-synapse.labels" . | nindent 4 }}
-    component: well-known
+    app.kubernetes.io/component: well-known
 spec:
   type: ClusterIP
   ports:
@@ -17,7 +17,7 @@ spec:
       name: http
   selector:
     {{- include "matrix-synapse.selectorLabels" . | nindent 4 }}
-    component: well-known
+    app.kubernetes.io/component: well-known
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -25,20 +25,20 @@ metadata:
   name: {{ $wkName }}
   labels:
     {{- include "matrix-synapse.labels" . | nindent 4 }}
-    component: well-known
+    app.kubernetes.io/component: well-known
 spec:
   replicas: {{ .Values.wellknown.replicaCount | default 1 }}
   selector:
     matchLabels:
       {{- include "matrix-synapse.selectorLabels" . | nindent 6 }}
-      component: well-known
+      app.kubernetes.io/component: well-known
   template:
     metadata:
       annotations:
         checksum/config: {{ include (print .Template.BasePath "/well-known-config.yaml") . | sha256sum }}
       labels:
         {{- include "matrix-synapse.selectorLabels" . | nindent 8 }}
-        component: well-known
+        app.kubernetes.io/component: well-known
     spec:
       {{- include "matrix-synapse.imagePullSecrets" . | nindent 6 }}
       securityContext:
diff --git a/charts/matrix-synapse/templates/worker-deployment.yaml b/charts/matrix-synapse/templates/worker-deployment.yaml
index a4f1c42..529c842 100644
--- a/charts/matrix-synapse/templates/worker-deployment.yaml
+++ b/charts/matrix-synapse/templates/worker-deployment.yaml
@@ -20,7 +20,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: {{ include (print $.Template.BasePath "/configuration.yaml") $ | sha256sum }}
+        checksum/config: {{ include (print $.Template.BasePath "/worker-configuration.yaml") $ | sha256sum }}
         checksum/secrets: {{ include (print $.Template.BasePath "/secrets.yaml") $ | sha256sum }}
       {{- with ($config.annotations | default $default.annotations) }}
         {{ . | toYaml | nindent 8 }}