From c770d566a82a848cf98d2102dcb4a31ed0a87b7c Mon Sep 17 00:00:00 2001 From: "snowpoke (aider)" Date: Tue, 11 Feb 2025 13:01:20 +0100 Subject: [PATCH 1/3] `chore: Modify DATABASE_HOSTNAME logic to consider generateHostname flag` --- charts/matrix/templates/synapse/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/matrix/templates/synapse/deployment.yaml b/charts/matrix/templates/synapse/deployment.yaml index 79480417..f8264687 100644 --- a/charts/matrix/templates/synapse/deployment.yaml +++ b/charts/matrix/templates/synapse/deployment.yaml @@ -64,7 +64,7 @@ spec: name: {{ include "matrix.postgresql.secretName" . }} key: {{ .Values.postgresql.global.postgresql.auth.secretKeys.databaseUsername }} - name: DATABASE_HOSTNAME - {{- if not .Values.postgresql.global.postgresql.auth.existingSecret }} + {{- if or (not .Values.postgresql.global.postgresql.auth.existingSecret) .Values.postgresql.global.postgresql.generateHostname }} value: {{ template "postgresql.v1.primary.fullname" .Subcharts.postgresql }} {{ else }} valueFrom: From 77fc8b010b841060e7958cf7aaaf0070c3ba2aa0 Mon Sep 17 00:00:00 2001 From: snowpoke Date: Tue, 11 Feb 2025 13:08:04 +0100 Subject: [PATCH 2/3] fix: remove check for secret hostname in initContainer --- .gitignore | 1 + charts/matrix/templates/synapse/deployment.yaml | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index f32e31af..e80fbbaa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .idea/ .DS_Store +.aider* diff --git a/charts/matrix/templates/synapse/deployment.yaml b/charts/matrix/templates/synapse/deployment.yaml index f8264687..28b842ce 100644 --- a/charts/matrix/templates/synapse/deployment.yaml +++ b/charts/matrix/templates/synapse/deployment.yaml @@ -64,14 +64,7 @@ spec: name: {{ include "matrix.postgresql.secretName" . }} key: {{ .Values.postgresql.global.postgresql.auth.secretKeys.databaseUsername }} - name: DATABASE_HOSTNAME - {{- if or (not .Values.postgresql.global.postgresql.auth.existingSecret) .Values.postgresql.global.postgresql.generateHostname }} value: {{ template "postgresql.v1.primary.fullname" .Subcharts.postgresql }} - {{ else }} - valueFrom: - secretKeyRef: - name: {{ include "matrix.postgresql.secretName" . }} - key: {{ .Values.postgresql.global.postgresql.auth.secretKeys.databaseHostname }} - {{- end }} {{- if .Values.postgresql.sslmode }} - name: PGSSLMODE value: {{ .Values.postgresql.sslmode }} From 8289bd2be3310fcd5f144d1fb329f3df59b05b71 Mon Sep 17 00:00:00 2001 From: "snowpoke (aider)" Date: Tue, 11 Feb 2025 13:17:06 +0100 Subject: [PATCH 3/3] chore: Bump version to 18.4.1 --- charts/matrix/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/matrix/Chart.yaml b/charts/matrix/Chart.yaml index 81016d63..60ccaae8 100644 --- a/charts/matrix/Chart.yaml +++ b/charts/matrix/Chart.yaml @@ -8,7 +8,7 @@ sources: type: application -version: 18.4.0 +version: 18.4.1 # renovate: image=ghcr.io/element-hq/synapse appVersion: v1.122.0