From c9b108c56ec766f2696ad4ba3509ce6d312be320 Mon Sep 17 00:00:00 2001
From: Serge Tkatchouk <sp1j3t@gmail.com>
Date: Fri, 9 Dec 2022 23:40:13 +0800
Subject: [PATCH] Always use JVB's podIP as Server ID

This way we no longer depend on having Colibri WS port exposed through a service
and instead allow `web` container to access all JVB instances simultaneously.\

As a side-effect, JVB service now works with LoadBalancer and NodePort setups.
Fixes #50.
---
 README.md                     |  1 -
 templates/jvb/deployment.yaml | 13 +------------
 templates/jvb/service.yaml    |  5 -----
 values.yaml                   |  7 -------
 4 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/README.md b/README.md
index 3515663..89c6e87 100644
--- a/README.md
+++ b/README.md
@@ -102,7 +102,6 @@ Parameter | Description | Default
 `enableAuth` | Enable authentication | `false`
 `enableGuests` | Enable guest access | `true`
 `websockets.colibri.enabled` | Enable WebSocket support for JVB/Colibri | `false`
-`websockets.colibri.serverID` | Set JVB/Colibri WS Server ID | `podIP` (see `values.yaml`)
 `websockets.xmpp.enabled` | Enable WebSocket support for Prosody/XMPP | `false`
 `jibri.enabled` | Enable Jibri service | `false`
 `jibri.persistence.enabled` | Enable persistent storage for Jibri recordings | `false`
diff --git a/templates/jvb/deployment.yaml b/templates/jvb/deployment.yaml
index 0f6d785..f51bc15 100644
--- a/templates/jvb/deployment.yaml
+++ b/templates/jvb/deployment.yaml
@@ -1,4 +1,3 @@
-{{- $serverID := default "podIP" .Values.websockets.colibri.serverID }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -75,21 +74,11 @@ spec:
                 fieldPath: status.hostIP
             {{- end }}
           {{- end }}
-          {{- if or .Values.websockets.colibri.enabled }}
+          {{- if .Values.websockets.colibri.enabled }}
           - name: JVB_WS_SERVER_ID
-            {{- if eq $serverID "service" }}
-            {{-   if .Values.global.clusterDomain }}
-            value: {{ include "jitsi-meet.jvb.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}
-            {{-   else }}
-            value: {{ include "jitsi-meet.jvb.fullname" . }}.{{ .Release.Namespace }}.svc
-            {{-   end }}
-            {{- else if eq $serverID "podIP" }}
             valueFrom:
               fieldRef:
                 fieldPath: status.podIP
-            {{- else }}
-            value: {{ $serverID | quote }}
-            {{- end }}
           {{- end }}
           {{- if  .Values.octo.enabled }}
           - name: JVB_OCTO_BIND_ADDRESS
diff --git a/templates/jvb/service.yaml b/templates/jvb/service.yaml
index d86385d..b8d780a 100644
--- a/templates/jvb/service.yaml
+++ b/templates/jvb/service.yaml
@@ -21,11 +21,6 @@ spec:
       {{- end }}
       protocol: UDP
       name: rtp-udp
-    {{- if or .Values.websockets.colibri.enabled }}
-    - port: 9090
-      protocol: TCP
-      name: colibri-ws-tcp
-    {{- end }}
   {{- with .Values.jvb.service.externalIPs }}
   externalIPs:
   {{ toYaml . | indent 2 | trim }}
diff --git a/values.yaml b/values.yaml
index d0fedd0..ec16315 100644
--- a/values.yaml
+++ b/values.yaml
@@ -36,13 +36,6 @@ websockets:
   ## Colibri (JVB signalling):
   colibri:
     enabled: false
-    ## Uncomment this to set JVB server ID manually,
-    ## Or use one of pre-defined values:
-    ## * "podIP" will fetch JVB pod's IP address from K8s metadata;
-    ## * "service" will use JVB service name generated by Helm.
-    ##
-    ## (default is "podIP")
-    # serverID: podIP
   ## XMPP (Prosody signalling):
   xmpp:
     enabled: false