From 87c8e7b1088a876c54001733b4da6add0bcda79f Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Tue, 15 Nov 2022 13:55:44 +0200
Subject: [PATCH] fix(omada): set also targetPort to the same port so
 everything works correctly (#4440)

---
 charts/stable/omada-controller/Chart.yaml     |  2 +-
 .../omada-controller/templates/common.yaml    | 25 ++++++++++++++++++-
 charts/stable/omada-controller/values.yaml    | 13 ----------
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/charts/stable/omada-controller/Chart.yaml b/charts/stable/omada-controller/Chart.yaml
index 24c8de757a9..23ad8495fc4 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: 8.0.3
+version: 8.0.4
 annotations:
   truecharts.org/catagories: |
     - media
diff --git a/charts/stable/omada-controller/templates/common.yaml b/charts/stable/omada-controller/templates/common.yaml
index c1a366e1cf0..2b51e6ce9f6 100644
--- a/charts/stable/omada-controller/templates/common.yaml
+++ b/charts/stable/omada-controller/templates/common.yaml
@@ -1 +1,24 @@
-{{ include "tc.common.loader.all" . }}
+{{/* Render the templates */}}
+{{ include "tc.common.loader.init" . }}
+
+{{/*
+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.
+When ingress is enabled, set this to 443, otherwise set it to whatever `port` is set to
+*/}}
+
+{{- $port := .Values.service.main.ports.main.port -}}
+{{- if .Values.ingress.main.enabled -}}
+  {{- $port = 443 -}}
+{{- end -}}
+
+{{- $_ := set .Values.env "MANAGE_HTTPS_PORT" $port -}}
+
+{{- $_ := set .Values.service.main.ports.main "targetPort" $port -}}
+
+{{- $_ := set .Values.probes.liveness "port" $port -}}
+{{- $_ := set .Values.probes.readiness "port" $port -}}
+{{- $_ := set .Values.probes.startup "port" $port -}}
+
+{{ include "tc.common.loader.apply" . }}
diff --git a/charts/stable/omada-controller/values.yaml b/charts/stable/omada-controller/values.yaml
index 174fcb80a9b..f38e15e2f80 100644
--- a/charts/stable/omada-controller/values.yaml
+++ b/charts/stable/omada-controller/values.yaml
@@ -12,21 +12,8 @@ podSecurityContext:
   runAsGroup: 0
 
 env:
-  # 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.
-  # When ingress is enabled, set this to 443, otherwise set it to whatever `port` is set to
-  MANAGE_HTTPS_PORT: "{{ if .Values.ingress.main.enabled }}443{{ else }}{{ .Values.service.main.ports.main.port }}{{ end }}"
   PORTAL_HTTPS_PORT: "{{ .Values.service.comm.ports.comm.port }}"
 
-probes:
-  liveness:
-    port: "{{ if .Values.ingress.main.enabled }}443{{ else }}{{ .Values.service.main.ports.main.port }}{{ end }}"
-  readiness:
-    port: "{{ if .Values.ingress.main.enabled }}443{{ else }}{{ .Values.service.main.ports.main.port }}{{ end }}"
-  startup:
-    port: "{{ if .Values.ingress.main.enabled }}443{{ else }}{{ .Values.service.main.ports.main.port }}{{ end }}"
-
 service:
   main:
     ports: