fix(collabora): Use internal connections

helmfile/apps/collabora/values-coco-enterprise.yaml.gotmpl

@@ -3,7 +3,7 @@
 ---
 controller:
   enableHashmapParallelization: true
-  ingressUrl: "https://{{ .Values.global.hosts.collabora }}.{{ .Values.global.domain }}"
+  ingressUrl: "http://ingress-nginx-controller.ingress-nginx.svc.{{ .Values.cluster.networking.domain }}"
   namespacedRole: true
   # CoolController uses `app.kubernetes.io/name` label to find deployment resource
   # openDesk uses `fullnameOverride` in Collabora Deployment that updates `metadata.name` not the `app.kubernetes.io/name`
@@ -33,12 +33,18 @@ ingress:
   enabled: {{ .Values.ingress.enabled }}
   annotations:
     {{ .Values.annotations.coco.ingress | toYaml | nindent 4 }}
+    nginx.ingress.kubernetes.io/force-ssl-redirect: ‘false’
+    nginx.ingress.kubernetes.io/ssl-redirect: 'false'
   className: {{ .Values.ingress.ingressClassName | quote }}
   hosts:
     - host: "{{ .Values.global.hosts.collabora }}.{{ .Values.global.domain }}"
       paths:
         - path: "/controller"
           pathType: "Prefix"
+    - host: {{ printf "ingress-nginx-controller.ingress-nginx.svc.%s" .Values.cluster.networking.domain | quote }}
+      paths:
+        - path: /controller/ws
+          pathType: Exact
   tls:
     - secretName: {{ .Values.ingress.tls.secretName | quote }}
       hosts:

helmfile/apps/collabora/values-enterprise.yaml.gotmpl

@@ -10,4 +10,14 @@ autoscaling:
   targetMemoryUtilizationPercentage: {{ .Values.enterpriseFeatures.collabora.autoscaling.targetMemoryUtilizationPercentage }}
   targetCPUUtilizationPercentage: {{ .Values.enterpriseFeatures.collabora.autoscaling.targetCPUUtilizationPercentage }}
   scaleDownDisabled: {{ .Values.enterpriseFeatures.collabora.autoscaling.scaleDownDisabled }}
+ingress:
+  hosts:
+    - host: "{{ .Values.global.hosts.collabora }}.{{ .Values.global.domain }}"
+      paths:
+        - path: "/"
+          pathType: "Prefix"
+    - host: {{ printf "ingress-nginx-controller.ingress-nginx.svc.%s" .Values.cluster.networking.domain | quote }}
+      paths:
+        - path: /hosting/capabilities
+          pathType: Exact
 ...

helmfile/apps/collabora/values.yaml.gotmpl

@@ -30,7 +30,7 @@ collabora:
     {{- end }}
     {{- if .Values.apps.collaboraController.enabled }}
     --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://ingress-nginx-controller.ingress-nginx.svc.{{ .Values.cluster.networking.domain }}/controller/ws
     --o:monitors.monitor[0][@retryInterval]=5
     {{- end }}
   username: "collabora-internal-admin"
@@ -52,6 +52,8 @@ ingress:
   annotations:
     {{- if .Values.apps.collaboraController.enabled }}
     nginx.ingress.kubernetes.io/upstream-hash-by: "$arg_RouteToken"
+    nginx.ingress.kubernetes.io/force-ssl-redirect: ‘false’
+    nginx.ingress.kubernetes.io/ssl-redirect: 'false'
     {{- else }}
     nginx.ingress.kubernetes.io/upstream-hash-by: "$arg_WOPISrc"
     {{- end }}