From 4c009b23794ba534f14429ce46564b3922e9e5d9 Mon Sep 17 00:00:00 2001 From: Jeff Billimek Date: Wed, 19 Sep 2018 11:47:05 +0000 Subject: [PATCH] updating unifi from helm/charts PR Signed-off-by: Jeff Billimek --- unifi/Chart.yaml | 8 ++++---- unifi/templates/controller-svc.yaml | 2 +- unifi/templates/deployment.yaml | 14 +++++++------- unifi/templates/discovery-svc.yaml | 2 +- unifi/templates/gui-svc.yaml | 4 ++-- unifi/templates/ingress.yaml | 3 +-- unifi/templates/stun-svc.yaml | 2 +- unifi/values.yaml | 2 +- 8 files changed, 18 insertions(+), 19 deletions(-) diff --git a/unifi/Chart.yaml b/unifi/Chart.yaml index e934bd3a..cecd9440 100644 --- a/unifi/Chart.yaml +++ b/unifi/Chart.yaml @@ -1,10 +1,10 @@ apiVersion: v1 -appVersion: 5.8.28 -description: Ubiqiti Network's Unifi Controller +appVersion: 5.8.30 +description: Ubiquiti Network's Unifi Controller name: unifi -version: 0.1.0 +version: 0.1.8 keywords: - - ubiqiti + - ubiquiti - unifi - mongodb home: https://github.com/jacobalberty/unifi-docker diff --git a/unifi/templates/controller-svc.yaml b/unifi/templates/controller-svc.yaml index 3626ced6..afe6a6a8 100644 --- a/unifi/templates/controller-svc.yaml +++ b/unifi/templates/controller-svc.yaml @@ -11,7 +11,7 @@ spec: type: {{ .Values.controllerService.type }} ports: - port: {{ .Values.controllerService.port }} - targetPort: 8080 + targetPort: controller protocol: TCP name: controller selector: diff --git a/unifi/templates/deployment.yaml b/unifi/templates/deployment.yaml index 70bde099..aae699c6 100644 --- a/unifi/templates/deployment.yaml +++ b/unifi/templates/deployment.yaml @@ -24,28 +24,28 @@ spec: image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - - name: gui - containerPort: {{ .Values.guiService.port }} + - name: https-gui + containerPort: 8443 protocol: TCP - name: controller - containerPort: {{ .Values.controllerService.port }} + containerPort: 8080 protocol: TCP - name: discovery - containerPort: {{ .Values.discoveryService.port }} + containerPort: 10001 protocol: UDP - name: stun - containerPort: {{ .Values.stunService.port }} + containerPort: 3478 protocol: UDP livenessProbe: httpGet: path: /status - port: gui + port: https-gui scheme: HTTPS initialDelaySeconds: 30 readinessProbe: httpGet: path: /status - port: gui + port: https-gui scheme: HTTPS initialDelaySeconds: 15 env: diff --git a/unifi/templates/discovery-svc.yaml b/unifi/templates/discovery-svc.yaml index 492f8ad2..747e637c 100644 --- a/unifi/templates/discovery-svc.yaml +++ b/unifi/templates/discovery-svc.yaml @@ -11,7 +11,7 @@ spec: type: {{ .Values.discoveryService.type }} ports: - port: {{ .Values.discoveryService.port }} - targetPort: http + targetPort: discovery protocol: UDP name: discovery selector: diff --git a/unifi/templates/gui-svc.yaml b/unifi/templates/gui-svc.yaml index bf998727..2c6b8c3f 100644 --- a/unifi/templates/gui-svc.yaml +++ b/unifi/templates/gui-svc.yaml @@ -37,10 +37,10 @@ spec: {{ toYaml .Values.guiService.externalIPs | indent 4 }} {{- end }} ports: - - name: https + - name: https-gui port: {{ .Values.guiService.port }} protocol: TCP - targetPort: 8443 + targetPort: https-gui {{ if (and (eq .Values.guiService.type "NodePort") (not (empty .Values.guiService.nodePort))) }} nodePort: {{.Values.guiService.nodePort}} {{ end }} diff --git a/unifi/templates/ingress.yaml b/unifi/templates/ingress.yaml index 9d892548..e94c3bcf 100644 --- a/unifi/templates/ingress.yaml +++ b/unifi/templates/ingress.yaml @@ -1,6 +1,5 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "unifi.fullname" . -}} -{{- $servicePort := .Values.guiService.port -}} {{- $ingressPath := .Values.ingress.path -}} apiVersion: extensions/v1beta1 kind: Ingress @@ -34,6 +33,6 @@ spec: - path: {{ $ingressPath }} backend: serviceName: {{ $fullName }}-gui - servicePort: {{ $servicePort }} + servicePort: https-gui {{- end }} {{- end }} diff --git a/unifi/templates/stun-svc.yaml b/unifi/templates/stun-svc.yaml index 0c5a5884..947654bb 100644 --- a/unifi/templates/stun-svc.yaml +++ b/unifi/templates/stun-svc.yaml @@ -11,7 +11,7 @@ spec: type: {{ .Values.stunService.type }} ports: - port: {{ .Values.stunService.port }} - targetPort: 10001 + targetPort: stun protocol: UDP name: stun selector: diff --git a/unifi/values.yaml b/unifi/values.yaml index 02d65d78..795b0590 100644 --- a/unifi/values.yaml +++ b/unifi/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 image: repository: jacobalberty/unifi - tag: 5.8.28 + tag: 5.8.30 pullPolicy: IfNotPresent guiService: