From fd8539c2baa00c7b9658e9a0357b78f33496f654 Mon Sep 17 00:00:00 2001
From: "Winston R. Milling" <Winston@Milli.ng>
Date: Thu, 4 Aug 2022 04:33:57 -0500
Subject: [PATCH] [dendrite] Upgrade to v0.9.1 (#1732)

* [dendrite] Upgrade to v0.9.1
---
 charts/incubator/dendrite/Chart.yaml          | 26 +++++--------------
 .../dendrite/templates/dendrite-config.yaml   |  4 +++
 charts/incubator/dendrite/values.yaml         |  8 ++++++
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/charts/incubator/dendrite/Chart.yaml b/charts/incubator/dendrite/Chart.yaml
index 655876fe25..b28b01fb2b 100644
--- a/charts/incubator/dendrite/Chart.yaml
+++ b/charts/incubator/dendrite/Chart.yaml
@@ -1,9 +1,9 @@
 ---
 apiVersion: v2
-appVersion: v0.8.9
+appVersion: v0.9.1
 description: Dendrite Matrix Homeserver
 name: dendrite
-version: 6.1.3
+version: 6.2.0
 kubeVersion: ">=1.16.0-0"
 keywords:
   - dendrite
@@ -81,21 +81,9 @@ dependencies:
     condition: dendrite.polylithEnabled
 annotations:
   artifacthub.io/changes: |-
+    - kind: added
+      description: Configuration options for in-memory cache
+    - kind: added
+      description: Configuration option for .well-known/matrix/client
     - kind: changed
-      description: Upgraded `common` chart dependency to version 4.5.2
-    - kind: changed
-      description: Upgraded `common` chart dependency to version 4.5.2 for alias 'clientapi'
-    - kind: changed
-      description: Upgraded `common` chart dependency to version 4.5.2 for alias 'mediaapi'
-    - kind: changed
-      description: Upgraded `common` chart dependency to version 4.5.2 for alias 'syncapi'
-    - kind: changed
-      description: Upgraded `common` chart dependency to version 4.5.2 for alias 'roomserver'
-    - kind: changed
-      description: Upgraded `common` chart dependency to version 4.5.2 for alias 'federationapi'
-    - kind: changed
-      description: Upgraded `common` chart dependency to version 4.5.2 for alias 'keyserver'
-    - kind: changed
-      description: Upgraded `common` chart dependency to version 4.5.2 for alias 'userapi'
-    - kind: changed
-      description: Upgraded `common` chart dependency to version 4.5.2 for alias 'appserviceapi'
+      description: Upgraded dendrite to 0.9.1
diff --git a/charts/incubator/dendrite/templates/dendrite-config.yaml b/charts/incubator/dendrite/templates/dendrite-config.yaml
index aa0650ef61..6675fc436a 100644
--- a/charts/incubator/dendrite/templates/dendrite-config.yaml
+++ b/charts/incubator/dendrite/templates/dendrite-config.yaml
@@ -16,7 +16,11 @@ stringData:
       server_name: {{ required "A server_name must be provided." .Values.dendrite.global.server_name | quote }}
       private_key: matrix_key.pem
       key_validity_period: {{ default "168h0m0s" .Values.dendrite.global.key_validity_period | quote }}
+      cache:
+        max_size_estimated: {{ default "1gb" .Values.dendrite.global.cache.max_size_estimated | quote }}
+        max_age: {{ default "1h" .Values.dendrite.global.cache.max_age | quote }}
       well_known_server_name: {{ default "" .Values.dendrite.global.well_known_server_name | quote }}
+      well_known_client_name: {{ default "" .Values.dendrite.global.well_known_client_name | quote }}
       trusted_third_party_id_servers:
       {{- toYaml .Values.dendrite.global.trusted_third_party_id_servers | nindent 8 }}
       disable_federation: {{ default false .Values.dendrite.global.disable_federation }}
diff --git a/charts/incubator/dendrite/values.yaml b/charts/incubator/dendrite/values.yaml
index 1429f4f3c8..2da570ddff 100644
--- a/charts/incubator/dendrite/values.yaml
+++ b/charts/incubator/dendrite/values.yaml
@@ -525,8 +525,16 @@ dendrite:
     server_name: localhost
     # -- Configure the key_validity period
     key_validity_period: 168h0m0s
+    # -- Congigure the in-memory caches
+    cache:
+      # -- Configure the maximum estimated cache size (not a hard limit)
+      max_size_estimated: "1gb"
+      # -- The maximum amount of time that a cache entry can live for in memory
+      max_age: "1h"
     # -- Configure the well-known server name and optional port
     well_known_server_name: ""
+    # -- Configure the well-known client name and optional port
+    well_known_client_name: ""
     # -- Configure the list of domains the server will trust as identity servers
     trusted_third_party_id_servers:
       - matrix.org