From 995ef7ef2bc1e41ce0557269636ee1c1846bf16c Mon Sep 17 00:00:00 2001
From: Arno DUBOIS <arno.du@orange.fr>
Date: Sat, 7 Mar 2020 18:59:34 +0100
Subject: [PATCH] [stable/unifi] Fixed some mistakes with nodePort (#21320)

Signed-off-by: Arno <arno.du@orange.fr>
---
 charts/unifi/Chart.yaml                 |  2 +-
 charts/unifi/templates/captive-svc.yaml | 10 +++++-----
 charts/unifi/templates/unified-svc.yaml |  4 ++--
 charts/unifi/values.yaml                |  7 ++-----
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/charts/unifi/Chart.yaml b/charts/unifi/Chart.yaml
index abd0a472..161d7cb2 100644
--- a/charts/unifi/Chart.yaml
+++ b/charts/unifi/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 5.11.50
 description: Ubiquiti Network's Unifi Controller
 name: unifi
-version: 0.6.2
+version: 0.6.3
 keywords:
   - ubiquiti
   - unifi
diff --git a/charts/unifi/templates/captive-svc.yaml b/charts/unifi/templates/captive-svc.yaml
index 43853cf8..9f651d6a 100644
--- a/charts/unifi/templates/captive-svc.yaml
+++ b/charts/unifi/templates/captive-svc.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "unifi.fullname" . }}-captivePortalService
+  name: {{ template "unifi.fullname" . }}-captiveportalservice
   labels:
     app.kubernetes.io/name: {{ include "unifi.name" . }}
     helm.sh/chart: {{ include "unifi.chart" . }}
@@ -45,15 +45,15 @@ spec:
       targetPort: captive-http
       protocol: TCP
       name: captive-http
-{{ if (and (eq .Values.captivePortalService.type "NodePort") (not (empty .Values.captivePortalService.nodePorts.http))) }}
-      nodePort: {{.Values.captivePortalService.nodePorts.http}}
+{{ if (and (eq .Values.captivePortalService.type "NodePort") (not (empty .Values.captivePortalService.http))) }}
+      nodePort: {{.Values.captivePortalService.http}}
 {{ end }}
     - port: {{ .Values.captivePortalService.https }}
       targetPort: captive-https
       protocol: TCP
       name: captive-https
-{{ if (and (eq .Values.captivePortalService.type "NodePort") (not (empty .Values.captivePortalService.nodePorts.https))) }}
-      nodePort: {{.Values.captivePortalService.nodePorts.https}}
+{{ if (and (eq .Values.captivePortalService.type "NodePort") (not (empty .Values.captivePortalService.https))) }}
+      nodePort: {{.Values.captivePortalService.https}}
 {{ end }}
   selector:
     app.kubernetes.io/name: {{ include "unifi.name" . }}
diff --git a/charts/unifi/templates/unified-svc.yaml b/charts/unifi/templates/unified-svc.yaml
index 05ba0f39..0b2bf72e 100644
--- a/charts/unifi/templates/unified-svc.yaml
+++ b/charts/unifi/templates/unified-svc.yaml
@@ -75,14 +75,14 @@ spec:
       protocol: TCP
       targetPort: captive-http
 {{ if (and (eq .Values.unifiedService.type "NodePort") (not (empty .Values.captivePortalService.http))) }}
-      nodePort: {{.Values.captivePortalService.nodePorts.http}}
+      nodePort: {{.Values.captivePortalService.http}}
 {{ end }}
     - name: captive-https
       port: {{ .Values.captivePortalService.https }}
       protocol: TCP
       targetPort: captive-https
 {{ if (and (eq .Values.unifiedService.type "NodePort") (not (empty .Values.captivePortalService.https))) }}
-      nodePort: {{.Values.captivePortalService.nodePorts.https}}
+      nodePort: {{.Values.captivePortalService.https}}
 {{ end }}
 {{ end }}
 
diff --git a/charts/unifi/values.yaml b/charts/unifi/values.yaml
index 4609dbda..e98ee599 100644
--- a/charts/unifi/values.yaml
+++ b/charts/unifi/values.yaml
@@ -62,14 +62,11 @@ guiService:
 captivePortalService:
   enabled: false
   type: ClusterIP
-  http: 8880
-  https: 8843
   ## Specify the nodePort value for the LoadBalancer and NodePort service types.
   ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
   ##
-  # nodePort:
-  #   http: 8880
-  #   https: 8843
+  http: 8880
+  https: 8843
   ## Provide any additional annotations which may be required. This can be used to
   ## set the LoadBalancer service type to internal only.
   ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer