master-group/charts
2
0
Fork 0
mirror of https://github.com/k8s-at-home/charts.git synced 2025-01-23 23:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

[stable/unifi] Fixed some mistakes with nodePort (#21320)

Browse Source 
Signed-off-by: Arno <arno.du@orange.fr>
This commit is contained in:
Arno DUBOIS 2020-03-07 18:59:34 +01:00 committed by Jeff Billimek
parent 6a3b129a4b
commit 995ef7ef2b
No known key found for this signature in database
GPG Key ID: 214B3EF39B4956B7
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/unifi/Chart.yaml
View File

@ -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

10
charts/unifi/templates/captive-svc.yaml
View File

@ -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" . }}

4
charts/unifi/templates/unified-svc.yaml
View File

@ -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 }}

7
charts/unifi/values.yaml
View File

@ -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