From 84b34985e372a3c98a72a2fb8eed8d0b1a504ee5 Mon Sep 17 00:00:00 2001
From: StevenMcElligott <89483932+StevenMcElligott@users.noreply.github.com>
Date: Thu, 17 Feb 2022 03:19:43 -0500
Subject: [PATCH] Adding Portal (comm) port to Omada-Controller (#1905)

* Update values.yaml

Adding missing ports for Omada to work, let me know how off I am lol

* Adding ports for Omada-Controller

Adding the missing port to Omada-Controller inside questions.yaml and values.yaml

* Adding ports for Omada-Controller

Adding the missing port to Omada-Controller inside questions.yaml and values.yaml, updated ports in manual and changed version
---
 charts/incubator/omada-controller/Chart.yaml  |  2 +-
 .../incubator/omada-controller/questions.yaml | 58 ++++++++++++++++++-
 charts/incubator/omada-controller/values.yaml |  8 +++
 docs/manual/default-ports.md                  |  3 +-
 4 files changed, 68 insertions(+), 3 deletions(-)

diff --git a/charts/incubator/omada-controller/Chart.yaml b/charts/incubator/omada-controller/Chart.yaml
index c9693839e17..65993b83d33 100644
--- a/charts/incubator/omada-controller/Chart.yaml
+++ b/charts/incubator/omada-controller/Chart.yaml
@@ -18,7 +18,7 @@ name: omada-controller
 sources:
 - https://github.com/mbentley/docker-omada-controller
 - https://github.com/truecharts/apps/tree/master/charts/omada-controller
-version: 4.0.63
+version: 4.0.64
 annotations:
   truecharts.org/catagories: |
     - media
diff --git a/charts/incubator/omada-controller/questions.yaml b/charts/incubator/omada-controller/questions.yaml
index 76c9a140588..169aeda76bb 100644
--- a/charts/incubator/omada-controller/questions.yaml
+++ b/charts/incubator/omada-controller/questions.yaml
@@ -124,7 +124,7 @@ questions:
                                   label: "Port Type"
                                   schema:
                                     type: string
-                                    default: "HTTP"
+                                    default: "HTTPS"
                                     enum:
                                       - value: HTTP
                                         description: "HTTP"
@@ -148,6 +148,62 @@ questions:
                                     type: int
                                     default: 8043
 
+        - variable: comm
+          label: "Omada Controller User HTTPS portal"
+          description: "Omada Controller User HTTPS portal"
+          schema:
+            additional_attrs: true
+            type: dict
+            attrs:
+# Include{serviceSelector}
+                    - variable: comm
+                      label: "TCP Service Port Configuration"
+                      schema:
+                        additional_attrs: true
+                        type: dict
+                        attrs:
+                          - variable: port
+                            label: "Port"
+                            description: "This port exposes the container port on the service"
+                            schema:
+                              type: int
+                              default: 8843
+                              required: true
+                          - variable: advanced
+                            label: "Show Advanced settings"
+                            schema:
+                              type: boolean
+                              default: false
+                              show_subquestions_if: true
+                              subquestions:
+                                - variable: protocol
+                                  label: "Port Type"
+                                  schema:
+                                    type: string
+                                    default: "HTTPS"
+                                    enum:
+                                      - value: HTTP
+                                        description: "HTTP"
+                                      - value: "HTTPS"
+                                        description: "HTTPS"
+                                      - value: TCP
+                                        description: "TCP"
+                                      - value: "UDP"
+                                        description: "UDP"
+                                - variable: nodePort
+                                  label: "Node Port (Optional)"
+                                  description: "This port gets exposed to the node. Only considered when service type is NodePort, Simple or LoadBalancer"
+                                  schema:
+                                    type: int
+                                    min: 9000
+                                    max: 65535
+                                - variable: targetPort
+                                  label: "Target Port"
+                                  description: "The internal(!) port on the container the Application runs on"
+                                  schema:
+                                    type: int
+                                    default: 8843
+
   - variable: serviceexpert
     group: "Networking and Services"
     label: "Show Expert Config"
diff --git a/charts/incubator/omada-controller/values.yaml b/charts/incubator/omada-controller/values.yaml
index df6c83cb001..0cb99a0a64b 100644
--- a/charts/incubator/omada-controller/values.yaml
+++ b/charts/incubator/omada-controller/values.yaml
@@ -26,8 +26,16 @@ service:
   main:
     ports:
       main:
+        protocol: HTTPS
         port: 8043
         targetPort: 8043
+  comm:
+    enabled: true
+    ports:
+      comm:
+        enabled: true
+        port: 8843
+        targetPor: 8843
   omada-tcp:
     enabled: true
     ports:
diff --git a/docs/manual/default-ports.md b/docs/manual/default-ports.md
index 396b4fbed66..76c0961c529 100644
--- a/docs/manual/default-ports.md
+++ b/docs/manual/default-ports.md
@@ -131,7 +131,8 @@ These defaults can of course be changed, but as we guarantee "sane, working defa
 | gaps                       |      main       |      main       | 8484  |   TCP    |                                         |
 | lidarr                     |      main       |      main       | 8686  |   TCP    |                                         |
 | readarr                    |      main       |      main       | 8787  |   TCP    |                                         |
-| unifi                      |   guestportal   |    websecure    | 8843  |  HTTPS   |                                         |
+| omada-controller           |   userportal    |    websecure    | 8843  |  HTTPS   |  Potential conflict with unifi          |
+| unifi                      |   guestportal   |    websecure    | 8843  |  HTTPS   |  Potential conflict with omada          |
 | minisatip                  |      main       |      main       | 8875  |   TCP    |                                         |
 | unifi                      |   guestportal   |       web       | 8880  |   HTTP   |                                         |
 | resilio-sync               |      main       |      main       | 8888  |   TCP    |                                         |