From 1c8b3a7a94e192d34c74835f11eeecbc4042b2b7 Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Sat, 16 May 2020 16:26:07 +0100 Subject: [PATCH 1/2] New Module - zigbee2mqttassistant --- charts/zigbee2mqttassistant/.helmignore | 22 ++++++ charts/zigbee2mqttassistant/Chart.yaml | 15 ++++ .../ci/default-values.yaml | 3 + .../ci/mqtt-existing.yaml | 4 + .../ci/mqtt-userpass-values.yaml | 5 ++ .../zigbee2mqttassistant/templates/NOTES.txt | 21 +++++ .../templates/_helpers.tpl | 56 ++++++++++++++ .../templates/deployment.yaml | 73 ++++++++++++++++++ .../templates/ingress.yaml | 41 ++++++++++ .../templates/secrets.yaml | 16 ++++ .../templates/service.yaml | 16 ++++ charts/zigbee2mqttassistant/values.yaml | 77 +++++++++++++++++++ 12 files changed, 349 insertions(+) create mode 100644 charts/zigbee2mqttassistant/.helmignore create mode 100644 charts/zigbee2mqttassistant/Chart.yaml create mode 100644 charts/zigbee2mqttassistant/ci/default-values.yaml create mode 100644 charts/zigbee2mqttassistant/ci/mqtt-existing.yaml create mode 100644 charts/zigbee2mqttassistant/ci/mqtt-userpass-values.yaml create mode 100644 charts/zigbee2mqttassistant/templates/NOTES.txt create mode 100644 charts/zigbee2mqttassistant/templates/_helpers.tpl create mode 100644 charts/zigbee2mqttassistant/templates/deployment.yaml create mode 100644 charts/zigbee2mqttassistant/templates/ingress.yaml create mode 100644 charts/zigbee2mqttassistant/templates/secrets.yaml create mode 100644 charts/zigbee2mqttassistant/templates/service.yaml create mode 100644 charts/zigbee2mqttassistant/values.yaml diff --git a/charts/zigbee2mqttassistant/.helmignore b/charts/zigbee2mqttassistant/.helmignore new file mode 100644 index 0000000..50af031 --- /dev/null +++ b/charts/zigbee2mqttassistant/.helmignore @@ -0,0 +1,22 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/charts/zigbee2mqttassistant/Chart.yaml b/charts/zigbee2mqttassistant/Chart.yaml new file mode 100644 index 0000000..0b81757 --- /dev/null +++ b/charts/zigbee2mqttassistant/Chart.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +appVersion: "0.3.165" +description: A web GUI for Zigbee2Mqtt +name: zigbee2mqttassistant +version: 0.1.0 +keywords: + - zigbee + - mqtt + - homeassistant +home: https://github.com/yllibed/Zigbee2MqttAssistant +sources: + - https://hub.docker.com/r/carldebilly/zigbee2mqttassistant +maintainers: + - name: nikdoof + email: andy@tensixtyone.com diff --git a/charts/zigbee2mqttassistant/ci/default-values.yaml b/charts/zigbee2mqttassistant/ci/default-values.yaml new file mode 100644 index 0000000..edb1c9c --- /dev/null +++ b/charts/zigbee2mqttassistant/ci/default-values.yaml @@ -0,0 +1,3 @@ +--- +z2ma: + broker: mqtt.svc.cluster.local diff --git a/charts/zigbee2mqttassistant/ci/mqtt-existing.yaml b/charts/zigbee2mqttassistant/ci/mqtt-existing.yaml new file mode 100644 index 0000000..f77988a --- /dev/null +++ b/charts/zigbee2mqttassistant/ci/mqtt-existing.yaml @@ -0,0 +1,4 @@ +--- +z2ma: + broker: mqtt.svc.cluster.local + existingSecretName: test diff --git a/charts/zigbee2mqttassistant/ci/mqtt-userpass-values.yaml b/charts/zigbee2mqttassistant/ci/mqtt-userpass-values.yaml new file mode 100644 index 0000000..52f02bf --- /dev/null +++ b/charts/zigbee2mqttassistant/ci/mqtt-userpass-values.yaml @@ -0,0 +1,5 @@ +--- +z2ma: + broker: mqtt.svc.cluster.local + username: test + password: test2 diff --git a/charts/zigbee2mqttassistant/templates/NOTES.txt b/charts/zigbee2mqttassistant/templates/NOTES.txt new file mode 100644 index 0000000..d426184 --- /dev/null +++ b/charts/zigbee2mqttassistant/templates/NOTES.txt @@ -0,0 +1,21 @@ +1. Get the application URL by running these commands: +{{- if .Values.ingress.enabled }} +{{- range $host := .Values.ingress.hosts }} + {{- range .paths }} + http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }} + {{- end }} +{{- end }} +{{- else if contains "NodePort" .Values.service.type }} + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "zigbee2mqttassistant.fullname" . }}) + export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") + echo http://$NODE_IP:$NODE_PORT +{{- else if contains "LoadBalancer" .Values.service.type }} + NOTE: It may take a few minutes for the LoadBalancer IP to be available. + You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "zigbee2mqttassistant.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "zigbee2mqttassistant.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + echo http://$SERVICE_IP:{{ .Values.service.port }} +{{- else if contains "ClusterIP" .Values.service.type }} + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "zigbee2mqttassistant.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl port-forward $POD_NAME 8080:80 +{{- end }} diff --git a/charts/zigbee2mqttassistant/templates/_helpers.tpl b/charts/zigbee2mqttassistant/templates/_helpers.tpl new file mode 100644 index 0000000..e0551ea --- /dev/null +++ b/charts/zigbee2mqttassistant/templates/_helpers.tpl @@ -0,0 +1,56 @@ +{{/* vim: set filetype=mustache: */}} +{{/* +Expand the name of the chart. +*/}} +{{- define "zigbee2mqttassistant.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "zigbee2mqttassistant.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- $name := default .Chart.Name .Values.nameOverride -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} +{{- end -}} +{{- end -}} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "zigbee2mqttassistant.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{/* +Common labels +*/}} +{{- define "zigbee2mqttassistant.labels" -}} +app.kubernetes.io/name: {{ include "zigbee2mqttassistant.name" . }} +helm.sh/chart: {{ include "zigbee2mqttassistant.chart" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end -}} + +{{/* +Create the name of the service account to use +*/}} +{{- define "zigbee2mqttassistant.serviceAccountName" -}} +{{- if .Values.serviceAccount.create -}} + {{ default (include "zigbee2mqttassistant.fullname" .) .Values.serviceAccount.name }} +{{- else -}} + {{ default "default" .Values.serviceAccount.name }} +{{- end -}} +{{- end -}} diff --git a/charts/zigbee2mqttassistant/templates/deployment.yaml b/charts/zigbee2mqttassistant/templates/deployment.yaml new file mode 100644 index 0000000..382ea7b --- /dev/null +++ b/charts/zigbee2mqttassistant/templates/deployment.yaml @@ -0,0 +1,73 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "zigbee2mqttassistant.fullname" . }} + labels: +{{ include "zigbee2mqttassistant.labels" . | indent 4 }} +spec: + replicas: {{ .Values.replicaCount }} + selector: + matchLabels: + app.kubernetes.io/name: {{ include "zigbee2mqttassistant.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + template: + metadata: + labels: + app.kubernetes.io/name: {{ include "zigbee2mqttassistant.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + securityContext: + {{- toYaml .Values.podSecurityContext | nindent 8 }} + containers: + - name: {{ .Chart.Name }} + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - name: http + containerPort: 80 + protocol: TCP + #livenessProbe: + # httpGet: + # path: / + # port: http + #readinessProbe: + # httpGet: + # path: / + # port: http + env: + - name: TZ + value: {{ .Values.TZ }} + - name: Z2MA_SETTINGS__MQTTSERVER + value: {{ .Values.z2ma.broker }} + {{- if and (.Values.z2ma.username) (.Values.z2ma.password) }} + - name: Z2MA_SETTINGS__MQTTUSERNAME + valueFrom: + secretKeyRef: + name: {{ default "zigbee2mqttassistant-secret" .Values.z2ma.existingSecretName }} + key: username + - name: Z2MA_SETTINGS__MQTTPASSWORD + valueFrom: + secretKeyRef: + name: {{ default "zigbee2mqttassistant-secret" .Values.z2ma.existingSecretName }} + key: password + {{- end }} + resources: + {{- toYaml .Values.resources | nindent 12 }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/charts/zigbee2mqttassistant/templates/ingress.yaml b/charts/zigbee2mqttassistant/templates/ingress.yaml new file mode 100644 index 0000000..fdceda4 --- /dev/null +++ b/charts/zigbee2mqttassistant/templates/ingress.yaml @@ -0,0 +1,41 @@ +{{- if .Values.ingress.enabled -}} +{{- $fullName := include "zigbee2mqttassistant.fullname" . -}} +{{- $svcPort := .Values.service.port -}} +{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1beta1 +{{- else -}} +apiVersion: extensions/v1beta1 +{{- end }} +kind: Ingress +metadata: + name: {{ $fullName }} + labels: +{{ include "zigbee2mqttassistant.labels" . | indent 4 }} + {{- with .Values.ingress.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: +{{- if .Values.ingress.tls }} + tls: + {{- range .Values.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} +{{- end }} + rules: + {{- range .Values.ingress.hosts }} + - host: {{ .host | quote }} + http: + paths: + {{- range .paths }} + - path: {{ . }} + backend: + serviceName: {{ $fullName }} + servicePort: {{ $svcPort }} + {{- end }} + {{- end }} +{{- end }} diff --git a/charts/zigbee2mqttassistant/templates/secrets.yaml b/charts/zigbee2mqttassistant/templates/secrets.yaml new file mode 100644 index 0000000..24b451d --- /dev/null +++ b/charts/zigbee2mqttassistant/templates/secrets.yaml @@ -0,0 +1,16 @@ +--- +{{- if and (and (not (.Values.existingSecretName)) (.Values.z2ma.username)) (.Values.z2ma.password) }} +apiVersion: v1 +kind: Secret +metadata: + name: zigbee2mqttassistant-secret + labels: + app.kubernetes.io/name: {{ include "zigbee2mqttassistant.name" . }} + helm.sh/chart: {{ include "zigbee2mqttassistant.chart" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ include "zigbee2mqttassistant.name" . }} +type: Opaque +data: + username: {{ .Values.z2ma.username | b64enc }} + password: {{ .Values.z2ma.password | b64enc }} +{{- end }} diff --git a/charts/zigbee2mqttassistant/templates/service.yaml b/charts/zigbee2mqttassistant/templates/service.yaml new file mode 100644 index 0000000..7c5a320 --- /dev/null +++ b/charts/zigbee2mqttassistant/templates/service.yaml @@ -0,0 +1,16 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "zigbee2mqttassistant.fullname" . }} + labels: +{{ include "zigbee2mqttassistant.labels" . | indent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: http + protocol: TCP + name: http + selector: + app.kubernetes.io/name: {{ include "zigbee2mqttassistant.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} diff --git a/charts/zigbee2mqttassistant/values.yaml b/charts/zigbee2mqttassistant/values.yaml new file mode 100644 index 0000000..490a3a0 --- /dev/null +++ b/charts/zigbee2mqttassistant/values.yaml @@ -0,0 +1,77 @@ +# Default values for zigbee2mqttassistant. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + +image: + repository: carldebilly/zigbee2mqttassistant + tag: 0.3.165 + pullPolicy: IfNotPresent + +imagePullSecrets: [] +nameOverride: "" +fullnameOverride: "" + +TZ: UTC + +## Z2MA Settings (more details: https://github.com/yllibed/Zigbee2MqttAssistant/blob/master/README.md) +z2ma: {} + # broker: mqtt.svc.cluster.local + + ## You can provide your MQTT username and password and a secret will be created... + ## + # username: user + # password: pass + + ## ... or you can provide a existing secret to pull these values from + ## + # existingSecretName: mqtt-secret + + +podSecurityContext: {} + # fsGroup: 2000 + +securityContext: {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true + # runAsNonRoot: true + # runAsUser: 1000 + +service: + type: ClusterIP + port: 8800 + +ingress: + enabled: false + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + hosts: + - host: chart-example.local + paths: [] + + tls: [] + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + +resources: {} + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + +nodeSelector: {} + +tolerations: [] + +affinity: {} From 083e8bd0e6a0630947eec700ba983df50254075f Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Fri, 22 May 2020 21:55:33 +0100 Subject: [PATCH 2/2] [zigbee2mqttassistant] Correct lint issues --- charts/zigbee2mqttassistant/ci/default-values.yaml | 2 +- charts/zigbee2mqttassistant/ci/mqtt-userpass-values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/zigbee2mqttassistant/ci/default-values.yaml b/charts/zigbee2mqttassistant/ci/default-values.yaml index edb1c9c..8da1a7c 100644 --- a/charts/zigbee2mqttassistant/ci/default-values.yaml +++ b/charts/zigbee2mqttassistant/ci/default-values.yaml @@ -1,3 +1,3 @@ --- z2ma: - broker: mqtt.svc.cluster.local + broker: mqtt.svc.cluster.local diff --git a/charts/zigbee2mqttassistant/ci/mqtt-userpass-values.yaml b/charts/zigbee2mqttassistant/ci/mqtt-userpass-values.yaml index 52f02bf..19a7d86 100644 --- a/charts/zigbee2mqttassistant/ci/mqtt-userpass-values.yaml +++ b/charts/zigbee2mqttassistant/ci/mqtt-userpass-values.yaml @@ -1,5 +1,5 @@ --- z2ma: - broker: mqtt.svc.cluster.local + broker: mqtt.svc.cluster.local username: test password: test2