Merge pull request #40 from element-hq:rdanzey/fix-element-call-config

element-call - Allow the config key to template directly into config so that parameters don't need to be enumerated in chart

Author: Arkaniad

charts/element-call/Chart.yaml

@@ -6,7 +6,7 @@ type: application
 
 # This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: "0.1.8"
+version: "0.2.0"
 
 # This version number should be incremented each time you make changes
 # to the application.

charts/element-call/templates/config-template.yaml

@@ -4,22 +4,4 @@ metadata:
   name: {{ .Release.Name }}-configmap
 data:
   config.json: |
-    {
-      "default_server_config": {
-        "m.homeserver": {
-          "base_url": "{{ .Values.config.homeserver.base_url }}",
-          "server_name": "{{ .Values.config.homeserver.server_name }}"
-        }
-      },
-      "livekit": {
-        "livekit_service_url": "{{ .Values.config.livekit.livekit_service_url }}"
-      },
-      "posthog": {
-        "api_key": "{{ .Values.config.posthog.api_key }}",
-        "api_host": "{{ .Values.config.posthog.api_host }}"
-      },
-      "rageshake": {
-        "submit_url": "{{ .Values.config.rageshake.submit_url }}"
-      },
-      "eula": "{{ .Values.config.eula_url }}"
-    }
+    {{ toPrettyJson .Values.config | nindent 4 }}

charts/element-call/values.yaml

@@ -82,14 +82,16 @@ tolerations: []
 affinity: {}
 
 config:
-  homeserver:
-    base_url: http://localhost:8008
-    server_name: localhost
+  default_server_config:
+    m.homeserver:
+      base_url: http://localhost:8008
+      server_name: localhost
   livekit:
     livekit_service_url: https://localhost/
   posthog:
     api_key:
     api_host: https://localhost
   rageshake:
     submit_url:
-  eula_url:
+  eula:
+    url: ""