From b00dcc37c1d3d29ff88f04428642bc02bb2b55cd Mon Sep 17 00:00:00 2001
From: "Winston R. Milling" <Winston@Milli.ng>
Date: Mon, 1 Aug 2022 14:33:51 -0500
Subject: [PATCH] [dendrite] Bump and correct postgresql subchart config
 (#1716)

---
 charts/incubator/dendrite/Chart.yaml  | 22 +++-------------------
 charts/incubator/dendrite/values.yaml |  6 +++---
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/charts/incubator/dendrite/Chart.yaml b/charts/incubator/dendrite/Chart.yaml
index 1c991096fe..51eac47f07 100644
--- a/charts/incubator/dendrite/Chart.yaml
+++ b/charts/incubator/dendrite/Chart.yaml
@@ -3,7 +3,7 @@ apiVersion: v2
 appVersion: v0.8.9
 description: Dendrite Matrix Homeserver
 name: dendrite
-version: 6.1.0
+version: 6.1.1
 kubeVersion: ">=1.16.0-0"
 keywords:
   - dendrite
@@ -24,7 +24,7 @@ dependencies:
     repository: https://library-charts.k8s-at-home.com
     version: 4.5.0
   - name: postgresql
-    version: 11.6.12
+    version: 11.6.21
     repository: https://charts.bitnami.com/bitnami
     condition: postgresql.enabled
   - name: nats
@@ -82,20 +82,4 @@ dependencies:
 annotations:
   artifacthub.io/changes: |-
     - kind: changed
-      description: Upgraded `common` chart dependency to version 4.5.0
-    - kind: changed
-      description: Upgraded `common` chart dependency to version 4.5.0 for alias 'clientapi'
-    - kind: changed
-      description: Upgraded `common` chart dependency to version 4.5.0 for alias 'mediaapi'
-    - kind: changed
-      description: Upgraded `common` chart dependency to version 4.5.0 for alias 'syncapi'
-    - kind: changed
-      description: Upgraded `common` chart dependency to version 4.5.0 for alias 'roomserver'
-    - kind: changed
-      description: Upgraded `common` chart dependency to version 4.5.0 for alias 'federationapi'
-    - kind: changed
-      description: Upgraded `common` chart dependency to version 4.5.0 for alias 'keyserver'
-    - kind: changed
-      description: Upgraded `common` chart dependency to version 4.5.0 for alias 'userapi'
-    - kind: changed
-      description: Upgraded `common` chart dependency to version 4.5.0 for alias 'appserviceapi'
+      description: Corrected postgres persistence definition and bumped chart version
diff --git a/charts/incubator/dendrite/values.yaml b/charts/incubator/dendrite/values.yaml
index 8e45af797b..1429f4f3c8 100644
--- a/charts/incubator/dendrite/values.yaml
+++ b/charts/incubator/dendrite/values.yaml
@@ -600,14 +600,14 @@ postgresql:
   enabled: false
   image:
     repository: bitnami/postgresql
-    tag: "14.1.0"
+    tag: "14.4.0"
   auth:
     username: dendrite
     password: changeme
     database: dendrite
-  persistence:
-    enabled: false
   primary:
+    persistence:
+      enabled: false
     initdb:
       scriptsConfigMap: "dendrite-postgresql-init-scripts"