From a684867ad6f8d3ad6f9932ade60175b887d2053d Mon Sep 17 00:00:00 2001
From: StevenMcElligott <89483932+StevenMcElligott@users.noreply.github.com>
Date: Sat, 15 Oct 2022 20:41:23 -0400
Subject: [PATCH] fix(Omada): Switch internal https port to 443, to stop
 redirection to 8043 on ingress (#4107)

* feat(Omada): Move main portal to HTTP for Ingress

* test a theor

* Update charts/stable/omada-controller/values.yaml

Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>

Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
---
 charts/stable/omada-controller/Chart.yaml     | 2 +-
 charts/stable/omada-controller/questions.yaml | 2 +-
 charts/stable/omada-controller/values.yaml    | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/charts/stable/omada-controller/Chart.yaml b/charts/stable/omada-controller/Chart.yaml
index 0dfe54d8286..24e47a2c555 100644
--- a/charts/stable/omada-controller/Chart.yaml
+++ b/charts/stable/omada-controller/Chart.yaml
@@ -18,7 +18,7 @@ name: omada-controller
 sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/omada-controller
   - https://github.com/mbentley/docker-omada-controller
-version: 6.1.1
+version: 6.2.0
 annotations:
   truecharts.org/catagories: |
     - media
diff --git a/charts/stable/omada-controller/questions.yaml b/charts/stable/omada-controller/questions.yaml
index f183e1a14c7..0dea2c2ec76 100644
--- a/charts/stable/omada-controller/questions.yaml
+++ b/charts/stable/omada-controller/questions.yaml
@@ -42,7 +42,7 @@ questions:
                                   description: The internal(!) port on the container the Application runs on
                                   schema:
                                     type: int
-                                    default: 8043
+                                    default: 443
         - variable: comm
           label: Omada Controller User HTTPS portal
           description: Omada Controller User HTTPS portal
diff --git a/charts/stable/omada-controller/values.yaml b/charts/stable/omada-controller/values.yaml
index 1fde597662f..177d0e4d1e3 100644
--- a/charts/stable/omada-controller/values.yaml
+++ b/charts/stable/omada-controller/values.yaml
@@ -12,7 +12,10 @@ podSecurityContext:
   runAsGroup: 0
 
 env:
-  MANAGE_HTTPS_PORT: "{{ .Values.service.main.ports.main.port }}"
+  # Omada automatically redirects to that port.
+  # Instead of consuming the external 443 port, it's better to switch internal
+  # But still give user the ability to change it.
+  MANAGE_HTTPS_PORT: "{{ .Values.service.main.ports.main.targetPort }}"
   PORTAL_HTTPS_PORT: "{{ .Values.service.comm.ports.comm.port }}"
 
 service:
@@ -21,6 +24,7 @@ service:
       main:
         protocol: HTTPS
         port: 8043
+        targetPort: 443
   comm:
     enabled: true
     ports: