element web: support multiple additional subproperties

charts/matrix-stack/README.md

@@ -177,15 +177,16 @@ also configured so that location sharing shows maps; please reconfigure as appro
 Additional Element Web configuration can be provided as a JSON String with
 ```yaml
 elementWeb:
-  additional: |
-    {
-      "default_theme": "dark",
-      "default_server_config": {
-        "m.identity_server": {
-          "base_url": "https://vector.im"
+  additional:
+    extra-config.json: |
+      {
+        "default_theme": "dark",
+        "default_server_config": {
+          "m.identity_server": {
+            "base_url": "https://vector.im"
+          }
         }
       }
-    }
 ```
 Full details on available configuration options can be found at
 https://github.com/element-hq/element-web/blob/develop/docs/config.md.

charts/matrix-stack/ci/fragments/element-web-pytest-extras.yaml

@@ -17,21 +17,22 @@ elementWeb:
   podSecurityContext:
     runAsGroup: 0
 
-  additional: |
-    {
-      "default_server_config": {
-        "m.homeserver": {
-          "base_url": "https://synapse.{{ $.Values.serverName }}"
+  additional:
+    user-config.json: |
+      {
+        "default_server_config": {
+          "m.homeserver": {
+            "base_url": "https://synapse.{{ $.Values.serverName }}"
+          }
+        },
+        "element_call": {
+          "url": "https://call.{{ $.Values.serverName }}",
+          "use_exclusively": true
+        },
+        "features": {
+          "feature_video_rooms": true,
+          "feature_group_calls": true,
+          "feature_new_room_decoration_ui": true,
+          "feature_element_call_video_rooms": true
         }
-      },
-      "element_call": {
-        "url": "https://call.{{ $.Values.serverName }}",
-        "use_exclusively": true
-      },
-      "features": {
-        "feature_video_rooms": true,
-        "feature_group_calls": true,
-        "feature_new_room_decoration_ui": true,
-        "feature_element_call_video_rooms": true
       }
-    }

charts/matrix-stack/ci/pytest-element-web-values.yaml

@@ -7,24 +7,25 @@
 
 # initSecrets, postgres don't have any required properties to be set and defaults to enabled
 elementWeb:
-  additional: |
-    {
-      "default_server_config": {
-        "m.homeserver": {
-          "base_url": "https://synapse.{{ $.Values.serverName }}"
+  additional:
+    user-config.json: |
+      {
+        "default_server_config": {
+          "m.homeserver": {
+            "base_url": "https://synapse.{{ $.Values.serverName }}"
+          }
+        },
+        "element_call": {
+          "url": "https://call.{{ $.Values.serverName }}",
+          "use_exclusively": true
+        },
+        "features": {
+          "feature_video_rooms": true,
+          "feature_group_calls": true,
+          "feature_new_room_decoration_ui": true,
+          "feature_element_call_video_rooms": true
         }
-      },
-      "element_call": {
-        "url": "https://call.{{ $.Values.serverName }}",
-        "use_exclusively": true
-      },
-      "features": {
-        "feature_video_rooms": true,
-        "feature_group_calls": true,
-        "feature_new_room_decoration_ui": true,
-        "feature_element_call_video_rooms": true
       }
-    }
   annotations:
     has-no-service-monitor: "true"
   ingress:

charts/matrix-stack/source/element-web.json

@@ -7,7 +7,10 @@
       "type": "boolean"
     },
     "additional": {
-      "type": "string"
+      "type": "object",
+      "additionalProperties": {
+        "type": "string"
+      }
     },
     "replicas": {
       "minimum": 1,

charts/matrix-stack/source/element-web.yaml.j2

@@ -9,11 +9,12 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 
 enabled: true
 
-## Arbitrary extra config to inject into Element Web's config.json a JSON string
+## Arbitrary extra config to inject into Element Web's config.json.
+## Each key under additional is an additional config to merge into Element Web's config.json.
 ##
 ## Full details on available configuration options can be found at https://github.com/element-hq/element-web/blob/develop/docs/config.md
 ## Most settings are configurable but some settings are owned by the chart and can't be overwritten
-additional: "{}"
+additional: {}
 
 # Number of Element Web replicas to start up
 replicas: 1

charts/matrix-stack/source/synapse.yaml.j2

@@ -29,7 +29,7 @@ media:
 {{- sub_schema_values.credential("Secret used to sign Synapse issued tokens", "macaroon", initIfAbsent=True) }}
 
 ## Additional configuration to provide to all Synapse processes.
-## Each key under additional is an additioanal config to merge into synapse homeserver.yaml
+## Each key under additional is an additional config to merge into synapse homeserver.yaml
 ## Full details on available configuration options can be found at https://element-hq.github.io/synapse/latest/usage/configuration/config_documentation.html
 {{- sub_schema_values.additionalConfig() }}
 

charts/matrix-stack/templates/element-web/_helpers.tpl

@@ -38,7 +38,13 @@ app.kubernetes.io/version: {{ .image.tag }}
 {{- $_ := set $config "default_server_config" $defaultServerConfig -}}
 {{- $_ := set $config "bug_report_endpoint_url" "https://element.io/bugreports/submit" -}}
 {{- $_ := set $config "map_style_url" "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx" -}}
-{{- tpl (toPrettyJson (merge $config (.additional | fromJson))) $root -}}
+{{- with .additional }}
+{{- range $key := (. | keys | uniq | sortAlpha) }}
+{{- $prop := index $root.Values.elementWeb.additional $key }}
+{{- $_ := (merge $config ($prop | fromJson)) -}}
+{{- end }}
+{{- end }}
+{{- tpl (toPrettyJson $config) $root -}}
 {{- end }}
 {{- end }}
 

charts/matrix-stack/values.schema.json

@@ -498,7 +498,10 @@
           "type": "boolean"
         },
         "additional": {
-          "type": "string"
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
         },
         "replicas": {
           "minimum": 1,

charts/matrix-stack/values.yaml

@@ -228,11 +228,12 @@ initSecrets:
 elementWeb:
   enabled: true
 
-  ## Arbitrary extra config to inject into Element Web's config.json a JSON string
+  ## Arbitrary extra config to inject into Element Web's config.json.
+  ## Each key under additional is an additional config to merge into Element Web's config.json.
   ##
   ## Full details on available configuration options can be found at https://github.com/element-hq/element-web/blob/develop/docs/config.md
   ## Most settings are configurable but some settings are owned by the chart and can't be overwritten
-  additional: "{}"
+  additional: {}
 
   # Number of Element Web replicas to start up
   replicas: 1
@@ -1273,7 +1274,7 @@ synapse:
   macaroon: {}
 
   ## Additional configuration to provide to all Synapse processes.
-  ## Each key under additional is an additioanal config to merge into synapse homeserver.yaml
+  ## Each key under additional is an additional config to merge into synapse homeserver.yaml
   ## Full details on available configuration options can be found at https://element-hq.github.io/synapse/latest/usage/configuration/config_documentation.html
   ## This can be provided in-line in the Helm Chart and/or via an existing Secret
   ## e.g.

newsfragments/254.changed.md

@@ -0,0 +1 @@
+ElementWeb additional config now expect multiple subproperties.