From 9a1f166b99f44231d3363734dfd7dd9241e21a95 Mon Sep 17 00:00:00 2001 From: Jeff Billimek Date: Wed, 1 Aug 2018 23:19:40 -0400 Subject: [PATCH] syncronizing with helm chart PR --- unifi/Chart.yaml | 6 +++--- unifi/README.md | 15 +++++++-------- unifi/templates/deployment.yaml | 22 +++++++++++++--------- unifi/values.yaml | 2 +- 4 files changed, 24 insertions(+), 21 deletions(-) diff --git a/unifi/Chart.yaml b/unifi/Chart.yaml index a865a7ba..ff58571c 100644 --- a/unifi/Chart.yaml +++ b/unifi/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: 5.8.24 description: Ubiqiti Network's Unifi Controller name: unifi -version: 0.1.10 +version: 0.1.13 keywords: - ubiqiti - unifi @@ -11,7 +11,7 @@ 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/billimek/billimek-charts +- https://github.com/kubernetes/charts/stable/unifi maintainers: - name: billimek - email: jeff@billimek.com \ No newline at end of file + email: jeff@billimek.com diff --git a/unifi/README.md b/unifi/README.md index 1f405e06..f47ad4e3 100644 --- a/unifi/README.md +++ b/unifi/README.md @@ -5,8 +5,7 @@ This is a helm chart for [Ubiqiti Network's](https://www.ubnt.com/) [Unifi Contr ## TL;DR; ```console -$ helm repo add billimek https://raw.githubusercontent.com/billimek/helm-repo/master -$ helm install billimek/unifi +$ helm install stable/unifi ``` ## Introduction @@ -18,7 +17,7 @@ This code is adopted from [this original repo](https://github.com/jacobalberty/u To install the chart with the release name `my-release`: ```console -$ helm install --name my-release billimek/unifi +$ helm install --name my-release stable/unifi ``` ## Uninstalling the Chart @@ -67,7 +66,7 @@ The following tables lists the configurable parameters of the Sentry chart and t | `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` | -| `persistence.enabled` | Use persistent volume to store data | `false` | +| `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` | | `persistence.storageClass` | Type of persistent volume claim | `-` | @@ -81,14 +80,14 @@ Specify each parameter using the `--set key=value[,key=value]` argument to `helm ```console helm install --name my-release \ - --set config.digitalocean.token=thisismyapikey \ - billimek/unifi + --set timezone="America/New York" \ + stable/unifi ``` Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example, ```console -helm install --name my-release -f values.yaml billimek/unifi +helm install --name my-release -f values.yaml stable/unifi ``` Read through the [values.yaml](values.yaml) file. It has several commented out suggested values. @@ -99,4 +98,4 @@ Read through the [values.yaml](values.yaml) file. It has several commented out s * `guiService`: represents the main web UI and is what one would normally point the ingress to * `controllerService`: This is needed in order for the unifi devices to talk to the controller and must be otherwise exposed to the network where the unifi devices run. If you run this as a NodePort (the default setting), make sure that there is an external loadbalancer that is directing traffic from port 8080 to the NodePort for this service * `discoveryService`: This needs to be reachable by the unifi devices on the network similar to the controllerService but only during the discovery phase. This is a UDP service -* `stunService`: Also used periodically by the unifi devices to communicate with the controller using UDP. See [this article](https://help.ubnt.com/hc/en-us/articles/204976094-UniFi-What-protocol-does-the-controller-use-to-communicate-with-the-UAP-) and [this other article](https://help.ubnt.com/hc/en-us/articles/115015457668-UniFi-Troubleshooting-STUN-Communication-Errors) for more information \ No newline at end of file +* `stunService`: Also used periodically by the unifi devices to communicate with the controller using UDP. See [this article](https://help.ubnt.com/hc/en-us/articles/204976094-UniFi-What-protocol-does-the-controller-use-to-communicate-with-the-UAP-) and [this other article](https://help.ubnt.com/hc/en-us/articles/115015457668-UniFi-Troubleshooting-STUN-Communication-Errors) for more information diff --git a/unifi/templates/deployment.yaml b/unifi/templates/deployment.yaml index 069b2b6e..1db3832d 100644 --- a/unifi/templates/deployment.yaml +++ b/unifi/templates/deployment.yaml @@ -24,7 +24,7 @@ spec: image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - - name: https + - name: gui containerPort: {{ .Values.guiService.port }} protocol: TCP - name: controller @@ -36,14 +36,18 @@ spec: - name: stun containerPort: {{ .Values.stunService.port }} protocol: UDP - # livenessProbe: - # httpGet: - # path: / - # port: http - # readinessProbe: - # httpGet: - # path: / - # port: http + livenessProbe: + httpGet: + path: /status + port: gui + scheme: HTTPS + initialDelaySeconds: 30 + readinessProbe: + httpGet: + path: /status + port: gui + scheme: HTTPS + initialDelaySeconds: 15 env: - name: TZ value: "{{ .Values.timezone }}" diff --git a/unifi/values.yaml b/unifi/values.yaml index 1b386d17..7378b9c1 100644 --- a/unifi/values.yaml +++ b/unifi/values.yaml @@ -102,7 +102,7 @@ mongodb: database_name: unifi persistence: - enabled: false + enabled: true ## unifi data Persistent Volume Storage Class ## If defined, storageClassName: ## If set to "-", storageClassName: "", which disables dynamic provisioning