fix(mycloud-matrix): improve things
This commit is contained in:
parent
a0c5e6b066
commit
52e5f8e479
5 changed files with 62 additions and 4 deletions
|
@ -40,6 +40,15 @@ commons:
|
||||||
# -- use own definition of tls (e.g. for own or wildcard certificate)
|
# -- use own definition of tls (e.g. for own or wildcard certificate)
|
||||||
override: []
|
override: []
|
||||||
|
|
||||||
|
networkpolicies:
|
||||||
|
enabled: false
|
||||||
|
from:
|
||||||
|
ingress: []
|
||||||
|
metrics: []
|
||||||
|
to:
|
||||||
|
smtp: []
|
||||||
|
matrix: []
|
||||||
|
|
||||||
grafana:
|
grafana:
|
||||||
datasource:
|
datasource:
|
||||||
labels:
|
labels:
|
||||||
|
|
|
@ -54,6 +54,15 @@ spec:
|
||||||
call:
|
call:
|
||||||
ingress:
|
ingress:
|
||||||
host: {{ .Values.ingress.elementCall.host | default (printf "call.%s" .Values.commons.ingress.domain) }}
|
host: {{ .Values.ingress.elementCall.host | default (printf "call.%s" .Values.commons.ingress.domain) }}
|
||||||
|
{{- if .Values.commons.networkpolicies.enabled }}
|
||||||
|
networkPolicy:
|
||||||
|
enabled: true
|
||||||
|
ingress:
|
||||||
|
http:
|
||||||
|
{{- toYaml .Values.commons.networkpolicies.from.ingress | nindent 14 }}
|
||||||
|
egress:
|
||||||
|
enabled: true
|
||||||
|
{{- end }}
|
||||||
config:
|
config:
|
||||||
{{- with .Values.commons.tracing }}
|
{{- with .Values.commons.tracing }}
|
||||||
{{- if .enabled }}
|
{{- if .enabled }}
|
||||||
|
@ -74,6 +83,17 @@ spec:
|
||||||
lkJWT:
|
lkJWT:
|
||||||
ingress:
|
ingress:
|
||||||
host: {{ .Values.ingress.elementCall.livekitJWT.host | default .Values.ingress.elementCall.host | default (printf "call.%s" .Values.commons.ingress.domain) }}
|
host: {{ .Values.ingress.elementCall.livekitJWT.host | default .Values.ingress.elementCall.host | default (printf "call.%s" .Values.commons.ingress.domain) }}
|
||||||
|
{{- if .Values.commons.networkpolicies.enabled }}
|
||||||
|
networkPolicy:
|
||||||
|
enabled: true
|
||||||
|
ingress:
|
||||||
|
http:
|
||||||
|
{{- toYaml .Values.commons.networkpolicies.from.ingress | nindent 14 }}
|
||||||
|
egress:
|
||||||
|
enabled: true
|
||||||
|
extra:
|
||||||
|
{{- toYaml .Values.commons.networkpolicies.to.matrix | nindent 14 }}
|
||||||
|
{{- end }}
|
||||||
config:
|
config:
|
||||||
key: {{ .Values.ingress.elementCall.livekitJWT.livekit.key | default .Values.livekit.key }}
|
key: {{ .Values.ingress.elementCall.livekitJWT.livekit.key | default .Values.livekit.key }}
|
||||||
url: "wss://{{ .Values.ingress.livekit.host | default (printf "sfu.call.%s" .Values.commons.ingress.domain) }}"
|
url: "wss://{{ .Values.ingress.livekit.host | default (printf "sfu.call.%s" .Values.commons.ingress.domain) }}"
|
||||||
|
|
|
@ -39,17 +39,20 @@ spec:
|
||||||
sso_redirect_options:
|
sso_redirect_options:
|
||||||
on_welcome_page: true
|
on_welcome_page: true
|
||||||
features:
|
features:
|
||||||
feature_notifications: true
|
{{- with .Values.ingress.element.config.features }}
|
||||||
feature_video_rooms: true
|
{{- toYaml . | nindent 8 }}
|
||||||
feature_new_room_decoration_ui: true
|
{{- end }}
|
||||||
feature_location_share_live: true
|
|
||||||
{{- if .Values.ingress.elementCall.enabled }}
|
{{- if .Values.ingress.elementCall.enabled }}
|
||||||
|
feature_video_rooms: true
|
||||||
feature_element_call_video_rooms: true
|
feature_element_call_video_rooms: true
|
||||||
feature_group_calls: true
|
feature_group_calls: true
|
||||||
element_call:
|
element_call:
|
||||||
url: "https://{{ .Values.ingress.elementCall.host | default (printf "call.%s" .Values.commons.ingress.domain) }}"
|
url: "https://{{ .Values.ingress.elementCall.host | default (printf "call.%s" .Values.commons.ingress.domain) }}"
|
||||||
use_exclusively: true
|
use_exclusively: true
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- with (omit .Values.ingress.element.config "features") }}
|
||||||
|
{{- toYaml . | nindent 6 }}
|
||||||
|
{{- end }}
|
||||||
ingress:
|
ingress:
|
||||||
enabled: true
|
enabled: true
|
||||||
annotations:
|
annotations:
|
||||||
|
|
|
@ -193,6 +193,14 @@ spec:
|
||||||
- type: "livekit"
|
- type: "livekit"
|
||||||
livekit_service_url: https://{{ .Values.ingress.elementCall.livekitJWT.host | default .Values.ingress.elementCall.host | default (printf "call.%s" .Values.commons.ingress.domain) }}
|
livekit_service_url: https://{{ .Values.ingress.elementCall.livekitJWT.host | default .Values.ingress.elementCall.host | default (printf "call.%s" .Values.commons.ingress.domain) }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- with .Values.ingress.server.wellknown.client }}
|
||||||
|
{{- toYaml . | nindent 8 }}
|
||||||
|
{{- end }}
|
||||||
|
{{- if .Values.ingress.elementCall.enabled }}
|
||||||
|
element:
|
||||||
|
call:
|
||||||
|
widget_url: https://{{ .Values.ingress.elementCall.host | default (printf "call.%s" .Values.commons.ingress.domain) }}
|
||||||
|
{{- end }}
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
cpu: 0.1
|
cpu: 0.1
|
||||||
|
|
|
@ -86,6 +86,15 @@ commons:
|
||||||
# @section -- Commons Ingress
|
# @section -- Commons Ingress
|
||||||
override: []
|
override: []
|
||||||
|
|
||||||
|
networkpolicies:
|
||||||
|
enabled: false
|
||||||
|
from:
|
||||||
|
ingress: []
|
||||||
|
metrics: []
|
||||||
|
to:
|
||||||
|
smtp: []
|
||||||
|
matrix: []
|
||||||
|
|
||||||
prometheus:
|
prometheus:
|
||||||
monitor:
|
monitor:
|
||||||
# -- labels on Pod- and Service-Monitor
|
# -- labels on Pod- and Service-Monitor
|
||||||
|
@ -168,6 +177,10 @@ ingress:
|
||||||
# -- default: matrix.(.commons.ingress.domain)
|
# -- default: matrix.(.commons.ingress.domain)
|
||||||
host:
|
host:
|
||||||
annotations: {}
|
annotations: {}
|
||||||
|
wellknown:
|
||||||
|
client:
|
||||||
|
m.tile_server:
|
||||||
|
map_style_url: "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
|
||||||
slidingSync:
|
slidingSync:
|
||||||
# -- default: sliding.matrix.(.commons.ingress.domain)
|
# -- default: sliding.matrix.(.commons.ingress.domain)
|
||||||
host:
|
host:
|
||||||
|
@ -181,6 +194,11 @@ ingress:
|
||||||
# -- default: element.(.commons.ingress.domain)
|
# -- default: element.(.commons.ingress.domain)
|
||||||
host:
|
host:
|
||||||
annotations: {}
|
annotations: {}
|
||||||
|
config:
|
||||||
|
features:
|
||||||
|
feature_notifications: true
|
||||||
|
feature_new_room_decoration_ui: true
|
||||||
|
feature_location_share_live: true
|
||||||
hydrogen:
|
hydrogen:
|
||||||
enabled: false
|
enabled: false
|
||||||
# -- default: hydrogen.(.commons.ingress.domain)
|
# -- default: hydrogen.(.commons.ingress.domain)
|
||||||
|
|
Loading…
Add table
Reference in a new issue