From 45d851ff389d35f5079fed469cc45e1172d9ea07 Mon Sep 17 00:00:00 2001
From: Victor Barba Martin <victor.barba@navigaglobal.com>
Date: Tue, 9 Nov 2021 16:42:47 +0100
Subject: [PATCH] reenable webrtc ingress

---
 k8s/applications/haproxy-ingress.yaml |  2 ++
 k8s/webrtc-be/deployment.yml          |  4 +--
 k8s/webrtc-be/ingress.yaml            | 52 +++++++++++++--------------
 k8s/webrtc-be/service.yml             |  7 ++--
 4 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/k8s/applications/haproxy-ingress.yaml b/k8s/applications/haproxy-ingress.yaml
index 924f2ac..1d3467f 100644
--- a/k8s/applications/haproxy-ingress.yaml
+++ b/k8s/applications/haproxy-ingress.yaml
@@ -15,6 +15,8 @@ spec:
     helm:
       valueFiles: []
       values: |-
+        controller:
+          hostNetwork: true
         prometheus-port: "9105"
   project: default
   syncPolicy:
diff --git a/k8s/webrtc-be/deployment.yml b/k8s/webrtc-be/deployment.yml
index 8fa6a1e..d60129a 100644
--- a/k8s/webrtc-be/deployment.yml
+++ b/k8s/webrtc-be/deployment.yml
@@ -30,5 +30,5 @@ spec:
             - name: RESTRICT_AUTH
               value: "false"         
           ports:
-            - name: https
-              containerPort: 443
+            - name: websocket-port
+              containerPort: 5001
diff --git a/k8s/webrtc-be/ingress.yaml b/k8s/webrtc-be/ingress.yaml
index 01d17eb..a3cc10a 100644
--- a/k8s/webrtc-be/ingress.yaml
+++ b/k8s/webrtc-be/ingress.yaml
@@ -1,26 +1,26 @@
-# apiVersion: networking.k8s.io/v1beta1
-# kind: Ingress
-# metadata:
-#   annotations:
-#     haproxy.org/ssl-redirect: "false"
-#     cert-manager.io/cluster-issuer: letsencrypt-haproxy-production
-#     ingress.kubernetes.io/config-backend: |
-#       balance url_param session_id
-#       timeout connect 1s
-#       timeout queue 5s
-#       timeout server 3600s
-#   name: webrtc-be
-# spec:
-#   ingressClassName: haproxy
-#   rules:
-#   - host: &host webrtc-be.staging.video.jamkazam.com
-#     http:
-#       paths:
-#       - backend:
-#           serviceName: webrtc-be-service
-#           servicePort: 80
-#         path: /
-#   tls:
-#   - secretName: webrtc-be
-#     hosts:
-#     - *host
\ No newline at end of file
+apiVersion: networking.k8s.io/v1beta1
+kind: Ingress
+metadata:
+  annotations:
+    haproxy.org/ssl-redirect: "false"
+    cert-manager.io/cluster-issuer: letsencrypt-haproxy-production
+    ingress.kubernetes.io/config-backend: |
+      balance url_param session_id
+      timeout connect 1s
+      timeout queue 5s
+      timeout server 3600s
+  name: webrtc-be
+spec:
+  ingressClassName: haproxy
+  rules:
+  - host: &host webrtc-be.staging.video.jamkazam.com
+    http:
+      paths:
+      - backend:
+          serviceName: webrtc-be-service
+          servicePort: 80
+        path: /
+  tls:
+  - secretName: webrtc-be
+    hosts:
+    - *host
\ No newline at end of file
diff --git a/k8s/webrtc-be/service.yml b/k8s/webrtc-be/service.yml
index 0a8937e..1e691d2 100644
--- a/k8s/webrtc-be/service.yml
+++ b/k8s/webrtc-be/service.yml
@@ -6,11 +6,10 @@ metadata:
   labels:
     app: webrtc-be
 spec:
-  type: LoadBalancer
   ports:
-    - name: https
-      port: 443
-      targetPort: https
+    - name: websocket-port
+      port: 80
+      targetPort: websocket-port
       protocol: TCP
   selector:
     app: webrtc-be