updating unifi from helm/charts PR

Signed-off-by: Jeff Billimek <jeff@billimek.com>
This commit is contained in:
Jeff Billimek 2018-09-19 11:47:05 +00:00
parent a034c3157f
commit 4c009b2379
8 changed files with 18 additions and 19 deletions

View File

@ -1,10 +1,10 @@
apiVersion: v1 apiVersion: v1
appVersion: 5.8.28 appVersion: 5.8.30
description: Ubiqiti Network's Unifi Controller description: Ubiquiti Network's Unifi Controller
name: unifi name: unifi
version: 0.1.0 version: 0.1.8
keywords: keywords:
- ubiqiti - ubiquiti
- unifi - unifi
- mongodb - mongodb
home: https://github.com/jacobalberty/unifi-docker home: https://github.com/jacobalberty/unifi-docker

View File

@ -11,7 +11,7 @@ spec:
type: {{ .Values.controllerService.type }} type: {{ .Values.controllerService.type }}
ports: ports:
- port: {{ .Values.controllerService.port }} - port: {{ .Values.controllerService.port }}
targetPort: 8080 targetPort: controller
protocol: TCP protocol: TCP
name: controller name: controller
selector: selector:

View File

@ -24,28 +24,28 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
ports: ports:
- name: gui - name: https-gui
containerPort: {{ .Values.guiService.port }} containerPort: 8443
protocol: TCP protocol: TCP
- name: controller - name: controller
containerPort: {{ .Values.controllerService.port }} containerPort: 8080
protocol: TCP protocol: TCP
- name: discovery - name: discovery
containerPort: {{ .Values.discoveryService.port }} containerPort: 10001
protocol: UDP protocol: UDP
- name: stun - name: stun
containerPort: {{ .Values.stunService.port }} containerPort: 3478
protocol: UDP protocol: UDP
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /status path: /status
port: gui port: https-gui
scheme: HTTPS scheme: HTTPS
initialDelaySeconds: 30 initialDelaySeconds: 30
readinessProbe: readinessProbe:
httpGet: httpGet:
path: /status path: /status
port: gui port: https-gui
scheme: HTTPS scheme: HTTPS
initialDelaySeconds: 15 initialDelaySeconds: 15
env: env:

View File

@ -11,7 +11,7 @@ spec:
type: {{ .Values.discoveryService.type }} type: {{ .Values.discoveryService.type }}
ports: ports:
- port: {{ .Values.discoveryService.port }} - port: {{ .Values.discoveryService.port }}
targetPort: http targetPort: discovery
protocol: UDP protocol: UDP
name: discovery name: discovery
selector: selector:

View File

@ -37,10 +37,10 @@ spec:
{{ toYaml .Values.guiService.externalIPs | indent 4 }} {{ toYaml .Values.guiService.externalIPs | indent 4 }}
{{- end }} {{- end }}
ports: ports:
- name: https - name: https-gui
port: {{ .Values.guiService.port }} port: {{ .Values.guiService.port }}
protocol: TCP protocol: TCP
targetPort: 8443 targetPort: https-gui
{{ if (and (eq .Values.guiService.type "NodePort") (not (empty .Values.guiService.nodePort))) }} {{ if (and (eq .Values.guiService.type "NodePort") (not (empty .Values.guiService.nodePort))) }}
nodePort: {{.Values.guiService.nodePort}} nodePort: {{.Values.guiService.nodePort}}
{{ end }} {{ end }}

View File

@ -1,6 +1,5 @@
{{- if .Values.ingress.enabled -}} {{- if .Values.ingress.enabled -}}
{{- $fullName := include "unifi.fullname" . -}} {{- $fullName := include "unifi.fullname" . -}}
{{- $servicePort := .Values.guiService.port -}}
{{- $ingressPath := .Values.ingress.path -}} {{- $ingressPath := .Values.ingress.path -}}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Ingress kind: Ingress
@ -34,6 +33,6 @@ spec:
- path: {{ $ingressPath }} - path: {{ $ingressPath }}
backend: backend:
serviceName: {{ $fullName }}-gui serviceName: {{ $fullName }}-gui
servicePort: {{ $servicePort }} servicePort: https-gui
{{- end }} {{- end }}
{{- end }} {{- end }}

View File

@ -11,7 +11,7 @@ spec:
type: {{ .Values.stunService.type }} type: {{ .Values.stunService.type }}
ports: ports:
- port: {{ .Values.stunService.port }} - port: {{ .Values.stunService.port }}
targetPort: 10001 targetPort: stun
protocol: UDP protocol: UDP
name: stun name: stun
selector: selector:

View File

@ -6,7 +6,7 @@ replicaCount: 1
image: image:
repository: jacobalberty/unifi repository: jacobalberty/unifi
tag: 5.8.28 tag: 5.8.30
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
guiService: guiService: