Skip to content

Commit

Permalink
Allow the config key to template directly into config so that paramet…
Browse files Browse the repository at this point in the history
…ers don't need to be enumerated in chart

Signed-off-by: Rhea Danzey <rdanzey@element.io>
  • Loading branch information
Arkaniad committed Aug 8, 2024
1 parent a4335b9 commit e473616
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 24 deletions.
2 changes: 1 addition & 1 deletion charts/element-call/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
20 changes: 1 addition & 19 deletions charts/element-call/templates/config-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
10 changes: 6 additions & 4 deletions charts/element-call/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""

0 comments on commit e473616

Please sign in to comment.