ungleich-public/ungleich-k8s
6
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update matrix

Browse source
This commit is contained in:
Nico Schottelius 2021-07-17 20:47:54 +02:00
parent ab3123c125
commit 9bc8f81c93
1 changed files with 30 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
apps/matrix/templates/deployment.yaml
View file

@ -20,21 +20,18 @@ spec:
command: command:
- sh - sh
- -c - -c
- until ls /etc/letsencrypt/live/{{ tpl .Values.fqdn . }}/fullchain.pem; do sleep 5; done - until ls /etc/letsencrypt/live/{{ tpl .Values.fqdn . }}/fullchain.pem; do sleep 2; done
volumeMounts: volumeMounts:
- name: etcletsencrypt - name: etcletsencrypt
mountPath: "/etc/letsencrypt" mountPath: "/etc/letsencrypt"
- name: generate-matrix-signing-key - name: generate-matrix-signing-key
image: matrixdotorg/synapse:v{{ .Values.synapseVersion }} image: ungleich/ungleich-matrix-synapse:{{ .Values.synapseVersion }}
env:
- name: SYNAPSE_CONFIG_PATH
value: "/config/homeserver.yaml"
command: command:
- "python" - "python"
- "-m" - "-m"
- "synapse.app.homeserver" - "synapse.app.homeserver"
- "--config-path" - "--config-path"
- "/config" - "/baseconfig"
- "--keys-directory" - "--keys-directory"
- "/data" - "/data"
- "--generate-keys" - "--generate-keys"
@ -42,9 +39,25 @@ spec:
- name: data - name: data
mountPath: "/data" mountPath: "/data"
- name: matrix-config - name: matrix-config
mountPath: "/config" mountPath: "/baseconfig"
containers: containers:
# This container will only start *after* the cert has been placed # This container will only start *after* the cert has been placed
- name: debug
image: alpine:latest
volumeMounts:
- name: nginx-config
mountPath: "/etc/nginx/conf.d/"
- name: etcletsencrypt
mountPath: "/etc/letsencrypt"
- name: data
mountPath: "/data"
- name: matrix-config
mountPath: "/baseconfig"
- name: postgres-vars
mountPath: "/postgres"
args:
- sleep
- "1000000"
- name: nginx - name: nginx
image: nginx:1.21-alpine image: nginx:1.21-alpine
ports: ports:
@ -61,23 +74,30 @@ spec:
envFrom: envFrom:
- secretRef: - secretRef:
name: {{ tpl .Values.identifier . }}-postgres-config name: {{ tpl .Values.identifier . }}-postgres-config
# Use subpath to avoid lost+found error
volumeMounts: volumeMounts:
- name: postgres-data - name: postgres-data
mountPath: "/var/lib/postgresql/data" mountPath: "/var/lib/postgresql/data"
# Use subpath to avoid lost+found error
subPath: postgres subPath: postgres
- name: matrix - name: matrix
# SYNAPSE_CONFIG_DIR: where additional configs are placed -> postgres-db.yaml
# SYNAPSE_CONFIG_PATH: the initial config
# log.yaml -> same dir as postgres-db.yaml
# /data = persistent storage
image: ungleich/ungleich-matrix-synapse:{{ .Values.synapseVersion }} image: ungleich/ungleich-matrix-synapse:{{ .Values.synapseVersion }}
ports: ports:
- containerPort: 8008 - containerPort: 8008
env: env:
- name: SYNAPSE_CONFIG_PATH
value: "/baseconfig/homeserver.yaml"
- name: SYNAPSE_CONFIG_DIR - name: SYNAPSE_CONFIG_DIR
value: "/config" value: "/config"
volumeMounts: volumeMounts:
- name: data - name: data
mountPath: "/data" mountPath: "/data"
- name: matrix-config - name: matrix-config
mountPath: "/config" mountPath: "/baseconfig"
volumes: volumes:
- name: etcletsencrypt - name: etcletsencrypt
persistentVolumeClaim: persistentVolumeClaim:
@ -238,7 +258,7 @@ metadata:
name: {{ tpl .Values.identifier . }}-postgres-config name: {{ tpl .Values.identifier . }}-postgres-config
annotations: annotations:
secret-generator.v1.mittwald.de/autogenerate: POSTGRES_PASSWORD secret-generator.v1.mittwald.de/autogenerate: POSTGRES_PASSWORD
data: stringdata:
POSTGRES_USER: "matrix-synapse" POSTGRES_USER: "matrix-synapse"
POSTGRES_DB: "matrix-synapse" POSTGRES_DB: "matrix-synapse"
POSTGRES_HOST: "localhost" POSTGRES_HOST: "localhost"