Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-k8s

This commit is contained in:
Nico Schottelius 2021-07-17 20:13:10 +02:00
commit ab3123c125
3 changed files with 15 additions and 5 deletions

View file

@ -112,6 +112,8 @@ spec:
containers: containers:
- name: certbot - name: certbot
image: ungleich/ungleich-certbot image: ungleich/ungleich-certbot
imagePullPolicy: Always
ports: ports:
- containerPort: 80 - containerPort: 80
env: env:

View file

@ -67,14 +67,12 @@ spec:
mountPath: "/var/lib/postgresql/data" mountPath: "/var/lib/postgresql/data"
subPath: postgres subPath: postgres
- name: matrix - name: matrix
image: matrixdotorg/synapse:v{{ .Values.synapseVersion }} image: ungleich/ungleich-matrix-synapse:{{ .Values.synapseVersion }}
ports: ports:
- containerPort: 8008 - containerPort: 8008
env: env:
- name: SYNAPSE_CONFIG_DIR - name: SYNAPSE_CONFIG_DIR
value: "/config" value: "/config"
# - name: SYNAPSE_CONFIG_PATH
# value: "/config/homeserver.yaml"
volumeMounts: volumeMounts:
- name: data - name: data
mountPath: "/data" mountPath: "/data"
@ -96,6 +94,11 @@ spec:
- name: matrix-config - name: matrix-config
configMap: configMap:
name: {{ tpl .Values.identifier . }}-matrix-config name: {{ tpl .Values.identifier . }}-matrix-config
items:
- key: homeserver.yaml
path: homeserver.yaml
- key: log.yaml
path: log.yaml
--- ---
apiVersion: v1 apiVersion: v1
@ -236,8 +239,9 @@ metadata:
annotations: annotations:
secret-generator.v1.mittwald.de/autogenerate: POSTGRES_PASSWORD secret-generator.v1.mittwald.de/autogenerate: POSTGRES_PASSWORD
data: data:
POSTGRES_USER: matrix-synapse POSTGRES_USER: "matrix-synapse"
POSTGRES_DB: matrix-synapse POSTGRES_DB: "matrix-synapse"
POSTGRES_HOST: "localhost"
--- ---
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap

View file

@ -119,3 +119,7 @@ Especially these:
finalizers: finalizers:
- cephblockpool.ceph.rook.io - cephblockpool.ceph.rook.io
``` ```
## Other flux related problems
* The host is not cleared / old /var/lib/rook is persisting