From fc9d4f0175c9fc0c3d76ee2d279dd0b877137481 Mon Sep 17 00:00:00 2001
From: taktakpeops <54535041+taktakpeops@users.noreply.github.com>
Date: Wed, 22 Apr 2020 16:42:14 +0200
Subject: [PATCH] fix(typos): make it work

---
 jitsi-meet/templates/deployment-jvb.yaml     |  4 ++--
 jitsi-meet/templates/deployment-prosody.yaml | 13 ++++++++++---
 jitsi-meet/templates/deployment-web.yaml     |  4 ++--
 jitsi-meet/templates/service-jvb.yaml        |  6 +++++-
 jitsi-meet/templates/service-prosody.yaml    |  4 ++++
 jitsi-meet/values.yaml                       |  4 +---
 6 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/jitsi-meet/templates/deployment-jvb.yaml b/jitsi-meet/templates/deployment-jvb.yaml
index aa5a8bd..f4d3c55 100644
--- a/jitsi-meet/templates/deployment-jvb.yaml
+++ b/jitsi-meet/templates/deployment-jvb.yaml
@@ -32,7 +32,7 @@ spec:
             - name: XMPP_SERVER
               value: {{ include "jitsi-meet.name-prosody" . }}
             {{- if .Values.jicofo.userAuth.enabled }}
-            - name: JICOFO_USER
+            - name: JICOFO_AUTH_USER
               value: {{ .Values.jicofo.userAuth.name }}
             - name: JICOFO_AUTH_PASSWORD
               valueFrom:
@@ -41,7 +41,7 @@ spec:
                   key: JICOFO_AUTH_PASSWORD
             {{- end }}
             {{- if .Values.jvb.userAuth.enabled }}
-            - name: JVB_USER
+            - name: JVB_AUTH_USER
               value: {{ .Values.jvb.userAuth.name }}
             - name: JVB_AUTH_PASSWORD
               valueFrom:
diff --git a/jitsi-meet/templates/deployment-prosody.yaml b/jitsi-meet/templates/deployment-prosody.yaml
index b7225b1..762ceb3 100644
--- a/jitsi-meet/templates/deployment-prosody.yaml
+++ b/jitsi-meet/templates/deployment-prosody.yaml
@@ -29,9 +29,13 @@ spec:
           imagePullPolicy: {{ .Values.jicofo.image.pullPolicy }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
           env:
             {{ if .Values.jicofo.userAuth.enabled }}
-            - name: JICOFO_USER
+            - name: JICOFO_AUTH_USER
               value: {{ .Values.jicofo.userAuth.name }}
             - name: JICOFO_AUTH_PASSWORD
               valueFrom:
@@ -61,7 +65,7 @@ spec:
           imagePullPolicy: {{ .Values.prosody.image.pullPolicy }}
           env:
             {{ if .Values.jicofo.userAuth.enabled }}
-            - name: JICOFO_USER
+            - name: JICOFO_AUTH_USER
               value: "{{ .Values.jicofo.userAuth.name }}"
             - name: JICOFO_AUTH_PASSWORD
               valueFrom:
@@ -77,7 +81,7 @@ spec:
                   key: JICOFO_COMPONENT_SECRET
             {{ end }}
             {{- if .Values.jvb.userAuth.enabled }}
-            - name: JVB_USER
+            - name: JVB_AUTH_USER
               value: {{ .Values.jvb.userAuth.name }}
             - name: JVB_AUTH_PASSWORD
               valueFrom:
@@ -99,6 +103,9 @@ spec:
             - containerPort: 5280
               protocol: TCP
               name: web
+            - containerPort: 5347
+              protocol: TCP
+              name: xmpp
           resources:
             {{- toYaml .Values.prosody.resources | nindent 12 }}
       {{- with .Values.prosody.nodeSelector }}
diff --git a/jitsi-meet/templates/deployment-web.yaml b/jitsi-meet/templates/deployment-web.yaml
index 0ba3e20..d312df9 100644
--- a/jitsi-meet/templates/deployment-web.yaml
+++ b/jitsi-meet/templates/deployment-web.yaml
@@ -33,7 +33,7 @@ spec:
             - name: XMPP_SERVER
               value: {{ include "jitsi-meet.name-prosody" . }}
             {{ if .Values.jicofo.userAuth.enabled }}
-            - name: JICOFO_USER
+            - name: JICOFO_AUTH_USER
               value: {{ .Values.jicofo.userAuth.name }}
             - name: JICOFO_AUTH_PASSWORD
               valueFrom:
@@ -42,7 +42,7 @@ spec:
                   key: JICOFO_AUTH_PASSWORD
             {{ end }}
             {{- if .Values.jvb.userAuth.enabled }}
-            - name: JVB_USER
+            - name: JVB_AUTH_USER
               value: {{ .Values.jvb.userAuth.name }}
             - name: JVB_AUTH_PASSWORD
               valueFrom:
diff --git a/jitsi-meet/templates/service-jvb.yaml b/jitsi-meet/templates/service-jvb.yaml
index 84b5d20..e36f7a9 100644
--- a/jitsi-meet/templates/service-jvb.yaml
+++ b/jitsi-meet/templates/service-jvb.yaml
@@ -4,13 +4,17 @@ metadata:
   name: {{ include "jitsi-meet.name-jvb" . }}
   labels:
 {{ include "jitsi-meet.labels" . | indent 4 }}
+  {{- with .Values.jvb.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   type: NodePort
   externalTrafficPolicy: Cluster
   ports:
   - port: 30300
     protocol: UDP
-    targetPort: 30300
+    targetPort: video
     nodePort: 30300
   selector:
     app.kubernetes.io/name: {{ include "jitsi-meet.name-jvb" . }}
diff --git a/jitsi-meet/templates/service-prosody.yaml b/jitsi-meet/templates/service-prosody.yaml
index 4cddc1e..c1e0e1f 100644
--- a/jitsi-meet/templates/service-prosody.yaml
+++ b/jitsi-meet/templates/service-prosody.yaml
@@ -19,6 +19,10 @@ spec:
       targetPort: web
       protocol: TCP
       name: web
+    - port: 5347
+      targetPort: xmpp
+      protocol: TCP
+      name: xmpp
   selector:
     app.kubernetes.io/name: {{ include "jitsi-meet.name-prosody" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
diff --git a/jitsi-meet/values.yaml b/jitsi-meet/values.yaml
index 3e765c7..27061cb 100644
--- a/jitsi-meet/values.yaml
+++ b/jitsi-meet/values.yaml
@@ -87,7 +87,7 @@ jicofo: # jicofo is used as a sidecar container for every prosody instance
 
 jvb:
   image:
-    repository: jitsi/prosody
+    repository: jitsi/jvb
     tag: latest
     pullPolicy: Always
   environment: []
@@ -97,8 +97,6 @@ jvb:
     annotations: []
     type: NodePort
     externalTrafficPolicy: Cluster
-    udpPort: 10000
-    tcpPort: 4443
   ingress:
     enabled: false
   resources: {}