From 5d03ac9628850b07e39ad0b32efc32739021d7c1 Mon Sep 17 00:00:00 2001 From: Jeff Billimek Date: Tue, 11 Sep 2018 14:29:08 +0000 Subject: [PATCH] updating with charts repo PR --- unifi/.helmignore | 2 + unifi/Chart.yaml | 18 ++++----- unifi/OWNERS | 4 ++ unifi/README.md | 8 ++-- unifi/templates/deployment.yaml | 70 ++++++++++++++++----------------- unifi/values.yaml | 18 ++++----- 6 files changed, 63 insertions(+), 57 deletions(-) create mode 100644 unifi/OWNERS diff --git a/unifi/.helmignore b/unifi/.helmignore index f0c13194..a9fe7278 100644 --- a/unifi/.helmignore +++ b/unifi/.helmignore @@ -19,3 +19,5 @@ .project .idea/ *.tmproj +# OWNERS file for Kubernetes +OWNERS \ No newline at end of file diff --git a/unifi/Chart.yaml b/unifi/Chart.yaml index ff58571c..e934bd3a 100644 --- a/unifi/Chart.yaml +++ b/unifi/Chart.yaml @@ -1,17 +1,17 @@ apiVersion: v1 -appVersion: 5.8.24 +appVersion: 5.8.28 description: Ubiqiti Network's Unifi Controller name: unifi -version: 0.1.13 +version: 0.1.0 keywords: -- ubiqiti -- unifi -- mongodb + - ubiqiti + - unifi + - mongodb home: https://github.com/jacobalberty/unifi-docker icon: https://blog.ubnt.com/wp-content/uploads/2016/10/unifi-app-logo.png sources: -- https://github.com/jacobalberty/unifi-docker -- https://github.com/kubernetes/charts/stable/unifi + - https://github.com/jacobalberty/unifi-docker + - https://github.com/kubernetes/charts/stable/unifi maintainers: -- name: billimek - email: jeff@billimek.com + - name: billimek + email: jeff@billimek.com diff --git a/unifi/OWNERS b/unifi/OWNERS new file mode 100644 index 00000000..b90909f4 --- /dev/null +++ b/unifi/OWNERS @@ -0,0 +1,4 @@ +approvers: +- billimek +reviewers: +- billimek diff --git a/unifi/README.md b/unifi/README.md index f47ad4e3..cf6ed43f 100644 --- a/unifi/README.md +++ b/unifi/README.md @@ -61,11 +61,11 @@ The following tables lists the configurable parameters of the Sentry chart and t | `ingress.hosts` | Ingress accepted hostnames | `chart-example.local` | | `ingress.tls` | Ingress TLS configuration | `[]` | | `timezone` | Timezone the Unifi controller should run as, e.g. 'America/New York' | `UTC` | -| `runas_root` | Run the controller as UID0 (root user) | `false` | +| `runAsRoot` | Run the controller as UID0 (root user) | `false` | | `mongodb.enabled` | Use external MongoDB for data storage | `false` | -| `mongodb.db_uri` | external MongoDB URI | `mongodb://mongo/unifi` | -| `mongodb.statdb_uri` | external MongoDB statdb URI | `mongodb://mongo/unifi_stat` | -| `mongodb.database_name` | external MongoDB database name | `unifi` | +| `mongodb.dbUri` | external MongoDB URI | `mongodb://mongo/unifi` | +| `mongodb.statDbUri` | external MongoDB statdb URI | `mongodb://mongo/unifi_stat` | +| `mongodb.databaseName` | external MongoDB database name | `unifi` | | `persistence.enabled` | Use persistent volume to store data | `true` | | `persistence.size` | Size of persistent volume claim | `5Gi` | | `persistence.existingClaim`| Use an existing PVC to persist data | `nil` | diff --git a/unifi/templates/deployment.yaml b/unifi/templates/deployment.yaml index 1db3832d..70bde099 100644 --- a/unifi/templates/deployment.yaml +++ b/unifi/templates/deployment.yaml @@ -24,18 +24,18 @@ spec: image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - - name: gui - containerPort: {{ .Values.guiService.port }} - protocol: TCP - - name: controller - containerPort: {{ .Values.controllerService.port }} - protocol: TCP - - name: discovery - containerPort: {{ .Values.discoveryService.port }} - protocol: UDP - - name: stun - containerPort: {{ .Values.stunService.port }} - protocol: UDP + - name: gui + containerPort: {{ .Values.guiService.port }} + protocol: TCP + - name: controller + containerPort: {{ .Values.controllerService.port }} + protocol: TCP + - name: discovery + containerPort: {{ .Values.discoveryService.port }} + protocol: UDP + - name: stun + containerPort: {{ .Values.stunService.port }} + protocol: UDP livenessProbe: httpGet: path: /status @@ -52,38 +52,38 @@ spec: - name: TZ value: "{{ .Values.timezone }}" - name: RUNAS_UID0 - value: "{{ .Values.runas_root }}" + value: "{{ .Values.runAsRoot }}" {{- if .Values.mongodb.enabled }} - name: DB_URI - value: "{{ .Values.mongodb.db_uri }}" + value: "{{ .Values.mongodb.dbUri }}" - name: STATDB_URI - value: "{{ .Values.mongodb.statdb_uri }}" + value: "{{ .Values.mongodb.statDbUri }}" - name: DB_NAME - value: "{{ .Values.mongodb.database_name }}" + value: "{{ .Values.mongodb.databaseName }}" {{- end }} volumeMounts: - - mountPath: /unifi/data - name: unifi-data - subPath: data - - mountPath: /unifi/log - name: unifi-data - subPath: log - - mountPath: /unifi/cert - name: unifi-data - subPath: cert - - mountPath: /unifi/init.d - name: unifi-data - subPath: init.d + - mountPath: /unifi/data + name: unifi-data + subPath: data + - mountPath: /unifi/log + name: unifi-data + subPath: log + - mountPath: /unifi/cert + name: unifi-data + subPath: cert + - mountPath: /unifi/init.d + name: unifi-data + subPath: init.d resources: {{ toYaml .Values.resources | indent 12 }} volumes: - - name: unifi-data - {{- if .Values.persistence.enabled }} - persistentVolumeClaim: - claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ template "unifi.fullname" . }}{{- end }} - {{- else }} - emptyDir: {} - {{ end }} + - name: unifi-data + {{- if .Values.persistence.enabled }} + persistentVolumeClaim: + claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ template "unifi.fullname" . }}{{- end }} + {{- else }} + emptyDir: {} + {{ end }} {{- with .Values.nodeSelector }} nodeSelector: {{ toYaml . | indent 8 }} diff --git a/unifi/values.yaml b/unifi/values.yaml index 7378b9c1..02d65d78 100644 --- a/unifi/values.yaml +++ b/unifi/values.yaml @@ -6,12 +6,12 @@ replicaCount: 1 image: repository: jacobalberty/unifi - tag: 5.8.24 + tag: 5.8.28 pullPolicy: IfNotPresent guiService: type: ClusterIP - port: 8443 + port: 8443 ## Specify the nodePort value for the LoadBalancer and NodePort service types. ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport ## @@ -28,7 +28,7 @@ guiService: controllerService: type: NodePort - port: 8080 + port: 8080 ## Specify the nodePort value for the LoadBalancer and NodePort service types. ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport ## @@ -45,7 +45,7 @@ controllerService: stunService: type: NodePort - port: 3478 # udp + port: 3478 # udp ## Specify the nodePort value for the LoadBalancer and NodePort service types. ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport ## @@ -62,7 +62,7 @@ stunService: discoveryService: type: NodePort - port: 10001 # udp + port: 10001 # udp ## Specify the nodePort value for the LoadBalancer and NodePort service types. ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport ## @@ -92,14 +92,14 @@ ingress: timezone: UTC -runas_root: false +runAsRoot: false # define an external mongoDB instead of using the built-in mongodb mongodb: enabled: false - db_uri: mongodb://mongo/unifi - statdb_uri: mongodb://mongo/unifi_stat - database_name: unifi + dbUri: mongodb://mongo/unifi + statDbUri: mongodb://mongo/unifi_stat + databaseName: unifi persistence: enabled: true