diff --git a/charts/matrix-stack/templates/postgres/_helpers.tpl b/charts/matrix-stack/templates/postgres/_helpers.tpl index e86cec80..dc029467 100644 --- a/charts/matrix-stack/templates/postgres/_helpers.tpl +++ b/charts/matrix-stack/templates/postgres/_helpers.tpl @@ -115,7 +115,6 @@ true {{- end -}} {{- end -}} - {{- define "element-io.postgres-password-updater.overrideEnv" }} {{- $root := .root -}} {{- with required "element-io.postgres.password-change-env missing context" .context -}} @@ -132,10 +131,12 @@ env: ) ) ) }} +- name: "PGHOST" + value: "/var/run/postgresql" {{- end -}} {{- end -}} - + {{- define "element-io.postgres.overrideEnv" }} {{- $root := .root -}} {{- with required "element-io.postgres.overrideEnv missing context" .context -}} diff --git a/charts/matrix-stack/templates/postgres/statefulset.yaml b/charts/matrix-stack/templates/postgres/statefulset.yaml index aa81a709..2e7f92a9 100644 --- a/charts/matrix-stack/templates/postgres/statefulset.yaml +++ b/charts/matrix-stack/templates/postgres/statefulset.yaml @@ -89,6 +89,8 @@ spec: subPath: configure-dbs.sh - name: database mountPath: /var/lib/postgres/data + - name: temp + mountPath: /tmp - name: var-run mountPath: /var/run/postgresql - name: postgres-ess-updater @@ -97,7 +99,7 @@ spec: - /bin/sh - -c - > - while ! pg_isready -d postgres -U postgres -h /var/run/postgresql; do echo "Postgres not yet ready"; sleep 1; done; + while ! pg_isready -d postgres -U postgres -h localhost; do echo "Postgres not yet ready"; sleep 1; done; echo "Postgres now ready, so changing password"; /bin/sh /var/run/configure-ess-dbs.sh; echo "Done"; @@ -183,6 +185,8 @@ spec: {{- end }} terminationGracePeriodSeconds: 60 volumes: + - emptyDir: {} + name: temp - emptyDir: {} name: var-run {{- if and $.Values.initSecrets.enabled (include "element-io.init-secrets.postgres-generated-secrets" (dict "root" $)) }} diff --git a/tests/manifests/__init__.py b/tests/manifests/__init__.py index 4de23651..6b85517f 100644 --- a/tests/manifests/__init__.py +++ b/tests/manifests/__init__.py @@ -486,7 +486,7 @@ all_components_details = [ content_volumes_mapping={ "/var/lib/postgres/data": ("pgdata",), }, - paths_consistency_noqa=("/docker-entrypoint-initdb.d/init-ess-dbs.sh",), + paths_consistency_noqa=("/tmp", "/docker-entrypoint-initdb.d/init-ess-dbs.sh",), ), ComponentDetails( name="matrix-rtc",