From f43d3ab7e75b3cfb99cd902eb6cc15f42d07600c Mon Sep 17 00:00:00 2001
From: David Luong <32136994+rh-dluong@users.noreply.github.com>
Date: Fri, 5 Feb 2021 20:01:32 -0500
Subject: [PATCH] Fixed unifi chart breaking from range restriction value on
 captive ingress (#555)

---
 charts/unifi/Chart.yaml                     | 2 +-
 charts/unifi/templates/captive-ingress.yaml | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/charts/unifi/Chart.yaml b/charts/unifi/Chart.yaml
index dfcc4c12..ecbb6d12 100644
--- a/charts/unifi/Chart.yaml
+++ b/charts/unifi/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 5.14.23
 description: Ubiquiti Network's Unifi Controller
 name: unifi
-version: 1.4.0
+version: 1.4.1
 keywords:
   - ubiquiti
   - unifi
diff --git a/charts/unifi/templates/captive-ingress.yaml b/charts/unifi/templates/captive-ingress.yaml
index e960bc32..8a687aed 100644
--- a/charts/unifi/templates/captive-ingress.yaml
+++ b/charts/unifi/templates/captive-ingress.yaml
@@ -2,6 +2,7 @@
 {{- $fullName := include "unifi.fullname" . -}}
 {{- $ingressPath := .Values.captivePortalService.ingress.path -}}
 {{- $unifiedServiceEnabled := .Values.unifiedService.enabled -}}
+{{- $captivePortalHttps := .Values.captivePortalService.https -}}
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
@@ -34,7 +35,7 @@ spec:
           - path: {{ $ingressPath }}
             backend:
               serviceName: {{ $fullName }}-captiveportalservice
-              {{- if .Values.captivePortalService.https }}
+              {{- if $captivePortalHttps }}
               servicePort: captive-https
               {{- else }}
               servicePort: captive-http