matrix-synapse: Slight template improvements

Fixes overly eager worker restart, uses the correct label for
application component for well-known server
This commit is contained in:
Alexander Olofsson 2020-08-14 10:42:14 +02:00
parent 038c4a9add
commit a05b870142
No known key found for this signature in database
GPG key ID: D439C9470CB04C73
3 changed files with 7 additions and 7 deletions

View file

@ -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

View file

@ -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:

View file

@ -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 }}