fix(collabora): Use internal connections

docs/data-storage.md

@@ -69,8 +69,7 @@ XWiki,PersistentVolume,1
 | Application          | Data Storage | Backup   | Content                                                                                    | Identifier                                     | Details                                                                                                                  |
 |----------------------|--------------|----------|--------------------------------------------------------------------------------------------|------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------|
 | **ClamAV**           | PVC          | No       | ClamAV Database                                                                            | `clamav-database-clamav-simple-0`              | `/var/lib/clamav`                                                                                                        |
-| **Dovecot**          | PVC          | Yes      | User mail directories (Only in Community Edition)                                          | `dovecot`                                      | `/srv/mail`                                                                                                              |
-|                      | S3           | Yes      | User mail directories (Only in Enterprise Edition)
+| **Dovecot**          | PVC          | Yes      | User mail directories (openDesk CE only, openDesk EE uses Dovecot Pro with Object Storage) | `dovecot`                                      | `/srv/mail`                                                                                                              |
 | **Element/Synapse**  | PostgreSQL   | Yes      | Application's main database                                                                | `matrix`                                       |                                                                                                                          |
 |                      | PVC          | Yes      | Attachments                                                                                | `media-opendesk-synapse-0`                     | `/media`                                                                                                                 |
 |                      |              | Yes      | Sync and state data                                                                        | `matrix-neodatefix-bot`                        | `/app/storage`                                                                                                           |
@@ -110,10 +109,9 @@ XWiki,PersistentVolume,1
 
 Additionally, the following persistent volumes are mounted by pods that serve as a data storage for the applications mentioned above.
 
-| Service    | Pod              | Volume Name  | PVC                         | MountPath             | Note                                                      |
-| ---------- | ---------------- | ------------ | --------------------------- | --------------------- |-----------------------------------------------------------|
-| MariaDB    | `mariadb-*`      | `data`       | `data-mariadb-0`            | `/var/lib/mysql`      |                                                           |
-| MinIO      | `minio-*-*`      | `data`       | `minio`                     | `/bitnami/minio/data` |                                                           |
-| PostgreSQL | `postgresql-*`   | `data`       | `data-postgresql-0`         | `/mnt/postgresql`     |                                                           |
-| Redis      | `redis-master-*` | `redis-data` | `redis-data-redis-master-0` | `/data`               |                                                           |
-| Cassandra  | `cassandra-*`    | `data`       | `data-cassandra-*`          | `/bitnami/cassandra`  | Its important to backup the PVC of every node!            |
+| Service    | Pod              | Volume Name  | PVC                         | MountPath             |
+| ---------- | ---------------- | ------------ | --------------------------- | --------------------- |
+| MariaDB    | `mariadb-*`      | `data`       | `data-mariadb-0`            | `/var/lib/mysql`      |
+| MinIO      | `minio-*-*`      | `data`       | `minio`                     | `/bitnami/minio/data` |
+| PostgreSQL | `postgresql-*`   | `data`       | `data-postgresql-0`         | `/mnt/postgresql`     |
+| Redis      | `redis-master-*` | `redis-data` | `redis-data-redis-master-0` | `/data`               |

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 }}