pub/charts
1
0
Fork 0
Code Issues Pull requests Releases Packages 19 Activity Actions

matrix-synapse: Slight template improvements

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
charts/matrix-synapse/Chart.yaml
View file

@ -6,7 +6,7 @@ icon: https://matrix.org/images/matrix-logo.svg
appVersion: 1.18.0 appVersion: 1.18.0
type: application type: application
version: 1.0.1 version: 1.0.2
maintainers: maintainers:
- name: Alexander Olofsson - name: Alexander Olofsson
email: ace@haxalot.com email: ace@haxalot.com

10
charts/matrix-synapse/templates/well-known.yaml
View file

@ -7,7 +7,7 @@ metadata:
name: {{ $wkName }} name: {{ $wkName }}
labels: labels:
{{- include "matrix-synapse.labels" . | nindent 4 }} {{- include "matrix-synapse.labels" . | nindent 4 }}
component: well-known app.kubernetes.io/component: well-known
spec: spec:
type: ClusterIP type: ClusterIP
ports: ports:
@ -17,7 +17,7 @@ spec:
name: http name: http
selector: selector:
{{- include "matrix-synapse.selectorLabels" . | nindent 4 }} {{- include "matrix-synapse.selectorLabels" . | nindent 4 }}
component: well-known app.kubernetes.io/component: well-known
--- ---
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
@ -25,20 +25,20 @@ metadata:
name: {{ $wkName }} name: {{ $wkName }}
labels: labels:
{{- include "matrix-synapse.labels" . | nindent 4 }} {{- include "matrix-synapse.labels" . | nindent 4 }}
component: well-known app.kubernetes.io/component: well-known
spec: spec:
replicas: {{ .Values.wellknown.replicaCount | default 1 }} replicas: {{ .Values.wellknown.replicaCount | default 1 }}
selector: selector:
matchLabels: matchLabels:
{{- include "matrix-synapse.selectorLabels" . | nindent 6 }} {{- include "matrix-synapse.selectorLabels" . | nindent 6 }}
component: well-known app.kubernetes.io/component: well-known
template: template:
metadata: metadata:
annotations: annotations:
checksum/config: {{ include (print .Template.BasePath "/well-known-config.yaml") . | sha256sum }} checksum/config: {{ include (print .Template.BasePath "/well-known-config.yaml") . | sha256sum }}
labels: labels:
{{- include "matrix-synapse.selectorLabels" . | nindent 8 }} {{- include "matrix-synapse.selectorLabels" . | nindent 8 }}
component: well-known app.kubernetes.io/component: well-known
spec: spec:
{{- include "matrix-synapse.imagePullSecrets" . | nindent 6 }} {{- include "matrix-synapse.imagePullSecrets" . | nindent 6 }}
securityContext: securityContext:

2
charts/matrix-synapse/templates/worker-deployment.yaml
View file

@ -20,7 +20,7 @@ spec:
template: template:
metadata: metadata:
annotations: 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 }} checksum/secrets: {{ include (print $.Template.BasePath "/secrets.yaml") $ | sha256sum }}
{{- with ($config.annotations | default $default.annotations) }} {{- with ($config.annotations | default $default.annotations) }}
{{ . | toYaml | nindent 8 }} {{ . | toYaml | nindent 8 }}