diff --git a/matrix/db.yaml b/matrix/db.yaml index 8745ffa..e807111 100644 --- a/matrix/db.yaml +++ b/matrix/db.yaml @@ -1,4 +1,3 @@ ---- apiVersion: v1 kind: PersistentVolumeClaim metadata: @@ -6,7 +5,7 @@ metadata: namespace: matrix spec: accessModes: - - ReadWriteMany + - ReadWriteMany resources: requests: storage: 4Gi @@ -30,58 +29,50 @@ spec: app: db spec: containers: - - name: db - image: postgres - imagePullPolicy: "IfNotPresent" - ports: - - name: mysql - containerPort: 5432 - env: - - name: MARIADB_ROOT_PASSWORD - valueFrom: - secretKeyRef: - name: matrix-db - key: root.pw - - name: POSTGRES_USER - valueFrom: - secretKeyRef: - name: matrix-db - key: username - optional: false - - name: POSTGRES_PASSWORD - valueFrom: - secretKeyRef: - name: matrix-db - key: user.pw - optional: false - - name: POSTGRES_DB - value: synapse - - name: POSTGRES_INITDB_ARGS - value: "--lc-collate=C --lc-ctype=C --encoding=UTF8" - #livenessProbe: - # exec: - # command: ["sh", "-c", "exec mysqladmin status -uroot -p$MARIADB_ROOT_PASSWORD"] - # initialDelaySeconds: 120 - # periodSeconds: 10 - # timeoutSeconds: 1 - # successThreshold: 1 - # failureThreshold: 3 - #readinessProbe: - # exec: - # command: ["sh", "-c", "exec mysqladmin status -uroot -p$MARIADB_ROOT_PASSWORD"] - # initialDelaySeconds: 30 - # periodSeconds: 10 - # timeoutSeconds: 1 - # successThreshold: 1 - # failureThreshold: 3 - volumeMounts: - - mountPath: /var/lib/postgresql/data - name: data + - name: db + image: postgres:17 + imagePullPolicy: IfNotPresent + ports: + - name: postgres + containerPort: 5432 + env: + - name: POSTGRES_USER + valueFrom: + secretKeyRef: + name: matrix-db + key: username + - name: POSTGRES_PASSWORD + valueFrom: + secretKeyRef: + name: matrix-db + key: user.pw + - name: POSTGRES_DB + value: synapse + - name: POSTGRES_INITDB_ARGS + value: "--lc-collate=C --lc-ctype=C --encoding=UTF8" + volumeMounts: + - mountPath: /var/lib/postgresql/data + name: data + readinessProbe: + exec: + command: + - sh + - -c + - pg_isready -U "$POSTGRES_USER" -d "$POSTGRES_DB" + initialDelaySeconds: 10 + periodSeconds: 10 + livenessProbe: + exec: + command: + - sh + - -c + - pg_isready -U "$POSTGRES_USER" -d "$POSTGRES_DB" + initialDelaySeconds: 30 + periodSeconds: 20 volumes: - - name: data - persistentVolumeClaim: - claimName: db - readOnly: false + - name: data + persistentVolumeClaim: + claimName: db --- apiVersion: v1 kind: Service @@ -91,13 +82,13 @@ metadata: spec: internalTrafficPolicy: Cluster ipFamilies: - - IPv6 + - IPv6 ipFamilyPolicy: SingleStack ports: - - name: postgres - port: 5432 - protocol: TCP - targetPort: 5432 + - name: postgres + port: 5432 + protocol: TCP + targetPort: 5432 selector: app: db sessionAffinity: None