From de257893d4ff2b3e8ea1d6988c6bdde5ed1eae9a Mon Sep 17 00:00:00 2001
From: Dominik Kaminski <kaminski@univention.de>
Date: Mon, 14 Aug 2023 16:03:13 +0200
Subject: [PATCH] fix(jitsi): Update support for NodePort setups with different
 ingress/egress ips

---
 helmfile/apps/jitsi/helmfile.yaml            | 2 +-
 helmfile/apps/jitsi/values-jitsi.gotmpl      | 4 +++-
 helmfile/environments/default/cluster.gotmpl | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/helmfile/apps/jitsi/helmfile.yaml b/helmfile/apps/jitsi/helmfile.yaml
index 1b05cad0..da9c89f3 100644
--- a/helmfile/apps/jitsi/helmfile.yaml
+++ b/helmfile/apps/jitsi/helmfile.yaml
@@ -8,7 +8,7 @@ repositories:
 releases:
   - name: "jitsi"
     chart: "jitsi/sovereign-workplace-jitsi"
-    version: "1.1.3"
+    version: "1.2.1"
     values:
       - "values-jitsi.gotmpl"
     condition: "jitsi.enabled"
diff --git a/helmfile/apps/jitsi/values-jitsi.gotmpl b/helmfile/apps/jitsi/values-jitsi.gotmpl
index c9a22b7f..75dc0cae 100644
--- a/helmfile/apps/jitsi/values-jitsi.gotmpl
+++ b/helmfile/apps/jitsi/values-jitsi.gotmpl
@@ -51,7 +51,7 @@ jitsi:
     {{- end }}
     extraEnvs:
       - name: "AUTH_TYPE"
-        value: "jwt"
+        value: "hybrid_matrix_token"
       - name: "JWT_APP_ID"
         value: "myappid"
       - name: "JWT_APP_SECRET"
@@ -111,6 +111,8 @@ jitsi:
   {{- end }}
 
 patchJVB:
+  configuration:
+    staticLoadbalancerIP: "{{ .Values.cluster.networking.ingressGatewayIP }}"
   image:
     registry: "{{ .Values.global.imageRegistry }}"
     repository: "{{ .Values.images.jitsiPatchJVB.repository }}"
diff --git a/helmfile/environments/default/cluster.gotmpl b/helmfile/environments/default/cluster.gotmpl
index 685c9fd7..ec71bc8a 100644
--- a/helmfile/environments/default/cluster.gotmpl
+++ b/helmfile/environments/default/cluster.gotmpl
@@ -19,6 +19,10 @@ cluster:
     domain: "cluster.local"
     # Kubernetes cluster network CIDR.
     cidr: "10.0.0.0/8"
+    # Ingress-gateway IP - only relevant for "NodePort" cluster services.
+    # When ingress and egress gateway use different ips, which results that pods can't self-discover their incoming ip,
+    # you need to provide the public (load-balanced) ingress gateways ip address.
+    ingressGatewayIP: ""
 
   container:
     # Used container engine in kubernetes cluster.