Skip to content
This repository has been archived by the owner on Feb 22, 2022. It is now read-only.

[stable/unifi] unifi chart enhancements #12047

Merged
merged 8 commits into from
Mar 28, 2019
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions stable/unifi/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
appVersion: 5.9.29
appVersion: 5.10.19
description: Ubiquiti Network's Unifi Controller
name: unifi
version: 0.3.3
version: 0.4.0
keywords:
- ubiquiti
- unifi
Expand Down
2 changes: 2 additions & 0 deletions stable/unifi/OWNERS
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
approvers:
- billimek
- mcronce
billimek marked this conversation as resolved.
Show resolved Hide resolved
reviewers:
- billimek
- mcronce
1 change: 1 addition & 0 deletions stable/unifi/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ The following tables lists the configurable parameters of the Unifi chart and th
| `image.repository` | Image repository | `jacobalberty/unifi` |
| `image.tag` | Image tag. Possible values listed [here][docker]. | `5.9.29` |
| `image.pullPolicy` | Image pull policy | `IfNotPresent` |
| `strategyType` | Specifies the strategy used to replace old Pods by new ones | `Recreate` |
| `guiService.type` | Kubernetes service type for the Unifi GUI | `ClusterIP` |
| `guiService.port` | Kubernetes port where the Unifi GUI is exposed | `8443` |
| `guiService.annotations` | Service annotations for the Unifi GUI | `{}` |
Expand Down
12 changes: 6 additions & 6 deletions stable/unifi/templates/controller-svc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ kind: Service
metadata:
name: {{ template "unifi.fullname" . }}-controller
labels:
app: {{ template "unifi.name" . }}
chart: {{ template "unifi.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
app.kubernetes.io/name: {{ include "unifi.name" . }}
helm.sh/chart: {{ include "unifi.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- if .Values.controllerService.labels }}
{{ toYaml .Values.controllerService.labels | indent 4 }}
{{- end }}
Expand Down Expand Up @@ -49,6 +49,6 @@ spec:
nodePort: {{.Values.controllerService.nodePort}}
{{ end }}
selector:
app: {{ template "unifi.name" . }}
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "unifi.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{ end }}
18 changes: 10 additions & 8 deletions stable/unifi/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,23 @@ kind: Deployment
metadata:
name: {{ template "unifi.fullname" . }}
labels:
app: {{ template "unifi.name" . }}
chart: {{ template "unifi.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
app.kubernetes.io/name: {{ include "unifi.name" . }}
helm.sh/chart: {{ include "unifi.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
spec:
replicas: {{ .Values.replicaCount }}
strategy:
type: {{ .Values.strategyType }}
selector:
matchLabels:
app: {{ template "unifi.name" . }}
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "unifi.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
template:
metadata:
labels:
app: {{ template "unifi.name" . }}
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "unifi.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- if .Values.podAnnotations }}
annotations:
{{- range $key, $value := .Values.podAnnotations }}
Expand Down
12 changes: 6 additions & 6 deletions stable/unifi/templates/discovery-svc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ kind: Service
metadata:
name: {{ template "unifi.fullname" . }}-discovery
labels:
app: {{ template "unifi.name" . }}
chart: {{ template "unifi.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
app.kubernetes.io/name: {{ include "unifi.name" . }}
helm.sh/chart: {{ include "unifi.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- if .Values.discoveryService.labels }}
{{ toYaml .Values.discoveryService.labels | indent 4 }}
{{- end }}
Expand Down Expand Up @@ -49,6 +49,6 @@ spec:
nodePort: {{.Values.discoveryService.nodePort}}
{{ end }}
selector:
app: {{ template "unifi.name" . }}
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "unifi.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{ end }}
12 changes: 6 additions & 6 deletions stable/unifi/templates/gui-svc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ kind: Service
metadata:
name: {{ template "unifi.fullname" . }}-gui
labels:
app: {{ template "unifi.name" . }}
chart: {{ template "unifi.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
app.kubernetes.io/name: {{ include "unifi.name" . }}
helm.sh/chart: {{ include "unifi.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- if .Values.guiService.labels }}
{{ toYaml .Values.guiService.labels | indent 4 }}
{{- end }}
Expand Down Expand Up @@ -49,6 +49,6 @@ spec:
nodePort: {{.Values.guiService.nodePort}}
{{ end }}
selector:
app: {{ template "unifi.name" . }}
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "unifi.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{ end }}
8 changes: 4 additions & 4 deletions stable/unifi/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ kind: Ingress
metadata:
name: {{ $fullName }}
labels:
app: {{ template "unifi.name" . }}
chart: {{ template "unifi.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
app.kubernetes.io/name: {{ include "unifi.name" . }}
helm.sh/chart: {{ include "unifi.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- with .Values.ingress.annotations }}
annotations:
{{ toYaml . | indent 4 }}
Expand Down
12 changes: 6 additions & 6 deletions stable/unifi/templates/stun-svc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ kind: Service
metadata:
name: {{ template "unifi.fullname" . }}-stun
labels:
app: {{ template "unifi.name" . }}
chart: {{ template "unifi.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
app.kubernetes.io/name: {{ include "unifi.name" . }}
helm.sh/chart: {{ include "unifi.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- if .Values.stunService.labels }}
{{ toYaml .Values.stunService.labels | indent 4 }}
{{- end }}
Expand Down Expand Up @@ -49,6 +49,6 @@ spec:
nodePort: {{.Values.stunService.nodePort}}
{{ end }}
selector:
app: {{ template "unifi.name" . }}
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "unifi.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{ end }}
12 changes: 6 additions & 6 deletions stable/unifi/templates/unified-svc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ kind: Service
metadata:
name: {{ template "unifi.fullname" . }}
labels:
app: {{ template "unifi.name" . }}
chart: {{ template "unifi.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
app.kubernetes.io/name: {{ include "unifi.name" . }}
helm.sh/chart: {{ include "unifi.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- if .Values.unifiedService.labels }}
{{ toYaml .Values.unifiedService.labels | indent 4 }}
{{- end }}
Expand Down Expand Up @@ -70,7 +70,7 @@ spec:
nodePort: {{.Values.guiService.nodePort}}
{{ end }}
selector:
app: {{ template "unifi.name" . }}
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "unifi.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{ end }}

5 changes: 4 additions & 1 deletion stable/unifi/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@

replicaCount: 1

# upgrade strategy type (e.g. Recreate or RollingUpdate)
strategyType: Recreate

image:
repository: jacobalberty/unifi
tag: 5.9.29
tag: 5.10.19
pullPolicy: IfNotPresent

# If enabled, the controller, discovery, GUI, and STUN services will not be
Expand Down