sheppy/opendesk
1
0
Fork 0
mirror of https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk.git synced 2025-12-06 23:41:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(collabora): Connect to Collabora Controller websocket via service

Browse Source
This commit is contained in:
Thomas Kaltenbrunner
2025-07-30 11:15:48 +02:00
committed by Thorsten Roßner
parent 90b22904da
commit 5d01f6023d
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
helmfile/apps/collabora/values-coco-enterprise.yaml.gotmpl
View File

@@ -32,7 +32,9 @@ imagePullSecrets:
ingress: ingress:
enabled: {{ .Values.ingress.enabled }} enabled: {{ .Values.ingress.enabled }}
annotations: annotations:
{{ .Values.annotations.coco.ingress | toYaml | nindent 4 }} {{- with .Values.annotations.coco.ingress }}
{{ . | toYaml | nindent 4 }}
{{- end }}
className: {{ .Values.ingress.ingressClassName | quote }} className: {{ .Values.ingress.ingressClassName | quote }}
hosts: hosts:
- host: "{{ .Values.global.hosts.collabora }}.{{ .Values.global.domain }}" - host: "{{ .Values.global.hosts.collabora }}.{{ .Values.global.domain }}"

12
helmfile/apps/collabora/values.yaml.gotmpl
View File

@@ -30,7 +30,7 @@ collabora:
{{- end }} {{- end }}
{{- if .Values.apps.collaboraController.enabled }} {{- if .Values.apps.collaboraController.enabled }}
--o:indirection_endpoint.url=https://{{ .Values.global.hosts.collabora }}.{{ .Values.global.domain }}/controller/routeToken --o:indirection_endpoint.url=https://{{ .Values.global.hosts.collabora }}.{{ .Values.global.domain }}/controller/routeToken
--o:monitors.monitor[0]=wss://{{ .Values.global.hosts.collabora }}.{{ .Values.global.domain }}/controller/ws --o:monitors.monitor[0]=ws://collabora-controller-cool-controller:9000/controller/ws
--o:monitors.monitor[0][@retryInterval]=5 --o:monitors.monitor[0][@retryInterval]=5
{{- end }} {{- end }}
username: "collabora-internal-admin" username: "collabora-internal-admin"
@@ -77,8 +77,8 @@ ingress:
# HAProxy # HAProxy
haproxy.org/timeout-tunnel: "{{ .Values.ingress.parameters.bodyTimeout.collabora }}s" haproxy.org/timeout-tunnel: "{{ .Values.ingress.parameters.bodyTimeout.collabora }}s"
haproxy.org/backend-config-snippet: | haproxy.org/backend-config-snippet: |
balance url_param WOPISrc check_post balance url_param WOPISrc check_post
hash-type consistent hash-type consistent
# HAProxy - Community: https://haproxy-ingress.github.io/ # HAProxy - Community: https://haproxy-ingress.github.io/
haproxy-ingress.github.io/timeout-tunnel: "{{ .Values.ingress.parameters.bodyTimeout.collabora }}s" haproxy-ingress.github.io/timeout-tunnel: "{{ .Values.ingress.parameters.bodyTimeout.collabora }}s"
haproxy-ingress.github.io/balance-algorithm: "url_param WOPISrc check_post" haproxy-ingress.github.io/balance-algorithm: "url_param WOPISrc check_post"
@@ -89,9 +89,9 @@ ingress:
acl admin_url path_beg /cool/adminws/ acl admin_url path_beg /cool/adminws/
acl admin_url path_beg /browser/dist/admin/admin.html acl admin_url path_beg /browser/dist/admin/admin.html
http-request deny if admin_url http-request deny if admin_url
{{- with .Values.annotations.collabora.ingress }} {{- with .Values.annotations.collabora.ingress }}
{{ . | toYaml | nindent 4 }} {{ . | toYaml | nindent 4 }}
{{- end }} {{- end }}
enabled: {{ .Values.ingress.enabled }} enabled: {{ .Values.ingress.enabled }}
className: {{ .Values.ingress.ingressClassName | quote }} className: {{ .Values.ingress.ingressClassName | quote }}
hosts: hosts: