[multiple] Bump various chart image versions (#88 )

* Bump various chart image versions * friagte: 0.6.0 * home-assistant: 0.116.1 * plex: 1.20.2.3402-0fec14d92 * teslamate: 1.20.0 Signed-off-by: Jeff Billimek <jeff@billimek.com> * fix teslamate postgres dependency chart Signed-off-by: Jeff Billimek <jeff@billimek.com> * remove global reference Signed-off-by: Jeff Billimek <jeff@billimek.com>
[Adguard-home] Allow to mount secret with certs so we can set the tls … (#87 )
2020-10-09 13:16:16 -04:00 · 2020-10-08 15:38:10 -04:00 · 2020-10-07 13:26:13 -04:00 · 2020-10-07 11:25:44 -04:00 · 2020-10-07 14:01:34 +02:00 · 2020-10-04 14:19:18 -04:00
29 changed files with 204 additions and 220 deletions
--- a/charts/adguard-home/Chart.yaml
+++ b/charts/adguard-home/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v0.102.0
 description: DNS proxy as ad-blocker for local network
 name: adguard-home
-version: 2.0.0
+version: 2.2.0
 keywords:
  - adguard-home
  - adguard
--- a/charts/adguard-home/templates/deployment.yaml
+++ b/charts/adguard-home/templates/deployment.yaml
@@ -83,6 +83,11 @@ spec:
            - name: config
              mountPath: /opt/adguardhome/conf
              readOnly: false
+            {{- if .Values.tlsSecretName }}
+            - name: certs
+              mountPath: /certs
+              readOnly: false
+            {{- end }}
          ports:
            - name: http
              {{- if .Values.configAsCode.enabled }}
@@ -153,6 +158,11 @@ spec:
          resources:
            {{- toYaml .Values.resources | nindent 12 }}
      volumes:
+      {{- if .Values.tlsSecretName }}
+      - name: certs
+        secret:
+          secretName: {{ .Values.tlsSecretName }}
+      {{- end }}
      {{- if .Values.configAsCode.enabled }}
      - name: configmap
        configMap:
--- a/charts/adguard-home/templates/service-dhcp.yaml
+++ b/charts/adguard-home/templates/service-dhcp.yaml
@@ -17,6 +17,14 @@ spec:
  {{- if .Values.serviceDHCP.loadBalancerIP }}
  loadBalancerIP: {{ .Values.serviceDHCP.loadBalancerIP }}
  {{- end }}
+  {{- if .Values.serviceDHCP.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+  {{ toYaml .Values.serviceDHCP.loadBalancerSourceRanges | indent 4 }}
+  {{- end -}}
+  {{- if .Values.serviceDHCP.externalIPs }}
+  externalIPs:
+  {{ toYaml .Values.serviceDHCP.externalIPs | indent 4 }}
+  {{- end }}
  externalTrafficPolicy: {{ .Values.serviceDHCP.externalTrafficPolicy }}
  ports:
    - port: 67
--- a/charts/adguard-home/templates/service-dns-over-tls.yaml
+++ b/charts/adguard-home/templates/service-dns-over-tls.yaml
@@ -17,6 +17,14 @@ spec:
  {{- if .Values.serviceDNSOverTLS.loadBalancerIP }}
  loadBalancerIP: {{ .Values.serviceDNSOverTLS.loadBalancerIP }}
  {{- end }}
+  {{- if .Values.serviceDNSOverTLS.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+  {{ toYaml .Values.serviceDNSOverTLS.loadBalancerSourceRanges | indent 4 }}
+  {{- end -}}
+  {{- if .Values.serviceDNSOverTLS.externalIPs }}
+  externalIPs:
+  {{ toYaml .Values.serviceDNSOverTLS.externalIPs | indent 4 }}
+  {{- end }}
  externalTrafficPolicy: {{ .Values.serviceDNSOverTLS.externalTrafficPolicy }}
  ports:
    - port: 853
--- a/charts/adguard-home/templates/service-tcp.yaml
+++ b/charts/adguard-home/templates/service-tcp.yaml
@@ -17,6 +17,14 @@ spec:
  {{- if .Values.serviceTCP.loadBalancerIP }}
  loadBalancerIP: {{ .Values.serviceTCP.loadBalancerIP }}
  {{- end }}
+  {{- if .Values.serviceTCP.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+  {{ toYaml .Values.serviceTCP.loadBalancerSourceRanges | indent 4 }}
+  {{- end -}}
+  {{- if .Values.serviceTCP.externalIPs }}
+  externalIPs:
+  {{ toYaml .Values.serviceTCP.externalIPs | indent 4 }}
+  {{- end }}
  externalTrafficPolicy: {{ .Values.serviceTCP.externalTrafficPolicy }}
  ports:
    - port: 53
--- a/charts/adguard-home/templates/service-udp.yaml
+++ b/charts/adguard-home/templates/service-udp.yaml
@@ -17,6 +17,14 @@ spec:
  {{- if .Values.serviceUDP.loadBalancerIP }}
  loadBalancerIP: {{ .Values.serviceUDP.loadBalancerIP }}
  {{- end }}
+  {{- if .Values.serviceUDP.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+  {{ toYaml .Values.serviceUDP.loadBalancerSourceRanges | indent 4 }}
+  {{- end -}}
+  {{- if .Values.serviceUDP.externalIPs }}
+  externalIPs:
+  {{ toYaml .Values.serviceUDP.externalIPs | indent 4 }}
+  {{- end }}
  externalTrafficPolicy: {{ .Values.serviceUDP.externalTrafficPolicy }}
  ports:
    - port: 53
--- a/charts/adguard-home/templates/service.yaml
+++ b/charts/adguard-home/templates/service.yaml
@@ -16,6 +16,14 @@ spec:
  {{- if .Values.service.loadBalancerIP }}
  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
  {{- end }}
+  {{- if .Values.service.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+  {{ toYaml .Values.service.loadBalancerSourceRanges | indent 4 }}
+  {{- end -}}
+  {{- if .Values.service.externalIPs }}
+  externalIPs:
+  {{ toYaml .Values.service.externalIPs | indent 4 }}
+  {{- end }}
  externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
  ports:
    - port: 3000
--- a/charts/adguard-home/values.yaml
+++ b/charts/adguard-home/values.yaml
@@ -165,6 +165,10 @@ configAsCode:
    verbose: false
    schema_version: 6

+tlsSecretName: ""
+# name of the secret that contains the tls cert and key.
+# this secret will be mounted inside the adguard container /certs path. e.g. works with cert-manager
+
 image:
  repository: adguard/adguardhome
  # Image tag is set via charts appVersion. If you want to override the tag, specify it here
@@ -224,8 +228,10 @@ probes:
 service:
  type: ClusterIP
  # externalTrafficPolicy: Local
+  # externalIPs: []
  # loadBalancerIP: ""
    # a fixed LoadBalancer IP
+  # loadBalancerSourceRanges: []
  annotations: {}
    # metallb.universe.tf/address-pool: network-services
    # metallb.universe.tf/allow-shared-ip: adguard-home-svc
@@ -234,8 +240,10 @@ serviceTCP:
  enabled: false
  type: NodePort
  # externalTrafficPolicy: Local
+  # externalIPs: []
  loadBalancerIP: ""
    # a fixed LoadBalancer IP
+  # loadBalancerSourceRanges: []
  annotations: {}
    # metallb.universe.tf/address-pool: network-services
    # metallb.universe.tf/allow-shared-ip: adguard-home-svc
@@ -244,8 +252,10 @@ serviceUDP:
  enabled: true
  type: NodePort
  # externalTrafficPolicy: Local
+  # externalIPs: []
  loadBalancerIP: ""
    # a fixed LoadBalancer IP
+  # loadBalancerSourceRanges: []
  annotations: {}
    # metallb.universe.tf/address-pool: network-services
    # metallb.universe.tf/allow-shared-ip: adguard-home-svc
@@ -255,8 +265,10 @@ serviceDNSOverTLS:
  ## Enable if you use AdGuard as a DNS over TLS/HTTPS server
  type: NodePort
  # externalTrafficPolicy: Local
+  # externalIPs: []
  loadBalancerIP: ""
    # a fixed LoadBalancer IP
+  # loadBalancerSourceRanges: []
  annotations: {}
    # metallb.universe.tf/address-pool: network-services
    # metallb.universe.tf/allow-shared-ip: adguard-home-svc
@@ -266,6 +278,7 @@ serviceDHCP:
  ## Enable if you use AdGuard as a DHCP Server
  type: NodePort
  # externalTrafficPolicy: Local
+  # externalIPs: []
  loadBalancerIP: ""
    # a fixed LoadBalancer IP
  annotations: {}
--- a/charts/frigate/Chart.yaml
+++ b/charts/frigate/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "0.5.2"
+appVersion: "0.6.0"
 description: Realtime object detection on RTSP cameras with the Google Coral
 name: frigate
-version: 4.0.0
+version: 4.0.1
 keywords:
  - tensorflow
  - coral
--- a/charts/frigate/values.yaml
+++ b/charts/frigate/values.yaml
@@ -9,7 +9,7 @@ strategyType: Recreate

 image:
  repository: blakeblackshear/frigate
-  tag: 0.5.2
+  tag: 0.6.0
  pullPolicy: IfNotPresent

 rtspPassword: password
--- a/charts/home-assistant/Chart.yaml
+++ b/charts/home-assistant/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: 0.115.2
+appVersion: 0.116.1
 description: Home Assistant
 name: home-assistant
-version: 2.5.0
+version: 2.5.1
 keywords:
 - home-assistant
 - hass
--- a/charts/home-assistant/values.yaml
+++ b/charts/home-assistant/values.yaml
@@ -4,7 +4,7 @@

 image:
  repository: homeassistant/home-assistant
-  tag: 0.115.2
+  tag: 0.116.1
  pullPolicy: IfNotPresent
  pullSecrets: []

--- a/charts/media-common/Chart.yaml
+++ b/charts/media-common/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: media-common
 description: Common dependancy chart for media ecosystem containers
 type: application
-version: 1.3.0
+version: 1.3.1
 keywords:
  - media-common
 home: https://github.com/k8s-at-home/charts/tree/master/charts/media-common
--- a/charts/media-common/templates/ingress.yaml
+++ b/charts/media-common/templates/ingress.yaml
@@ -64,7 +64,7 @@ kind: Ingress
 metadata:
  name: {{ $fullName }}-{{ $ingress.nameSuffix | default $index }}
  labels:
-    {{- include "media-common.labels" . | nindent 4 }}
+    {{- include "media-common.labels" $ | nindent 4 }}
    {{- with $ingress.annotations }}
  annotations:
  {{- toYaml . | nindent 4 }}
--- a/charts/plex/Chart.yaml
+++ b/charts/plex/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: 1.20.1.3252
+appVersion: 1.20.2.3402
 description: Plex Media Server
 name: plex
-version: 2.0.3
+version: 2.0.4
 keywords:
  - plex
 home: https://plex.tv/
--- a/charts/plex/values.yaml
+++ b/charts/plex/values.yaml
@@ -6,7 +6,7 @@

 image:
  repository: plexinc/pms-docker
-  tag: 1.20.1.3252-a78fef9a9
+  tag: 1.20.2.3402-0fec14d92
  pullPolicy: IfNotPresent

 #####   START  --> Official PLEX container environment variables
--- a/charts/teslamate/Chart.yaml
+++ b/charts/teslamate/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: v1.19.3
+appVersion: v1.20.0
 description: A self-hosted data logger for your Tesla 🚘
 name: teslamate
-version: 3.0.1
+version: 3.0.2
 keywords:
  - teslamate
  - tesla
@@ -12,8 +12,8 @@ sources:
  - https://github.com/adriankumpf/teslamate
 dependencies:
 - name: postgresql
-  version: 8.1.0
-  repository: https://kubernetes-charts.storage.googleapis.com/
+  version: 9.1.2
+  repository: https://charts.bitnami.com/bitnami
  condition: postgresql.enabled
 maintainers:
  - name: billimek
--- a/charts/teslamate/values.yaml
+++ b/charts/teslamate/values.yaml
@@ -2,7 +2,7 @@ replicaCount: 1

 image:
  repository: teslamate/teslamate
-  tag: 1.19.3
+  tag: 1.20.0
  pullPolicy: IfNotPresent

 nameOverride: ""
@@ -81,54 +81,21 @@ tolerations: []

 affinity: {}

-## Configuration values for the postgresql dependency.
-## Ref: https://github.com/helm/charts/blob/master/stable/postgresql/README.md
+# Configuration values for the postgresql dependency.
+# ... for more options see https://github.com/bitnami/charts/tree/master/bitnami/postgresql
 postgresql:
+  enabled: true
+  postgresqlUsername: teslamate
+  postgresqlPassword: teslamate
+  postgresqlDatabase: teslamate
  image:
    repository: postgres
    tag: 12.1
  postgresqlDataDir: "/data/pgdata"
-
-  ### PostgreSQL User to create.
-  ##
-  postgresqlUsername: teslamate
-
-  ## PostgreSQL Password for the new user.
-  ## If not set, a random 10 characters password will be used.
-  ##
-  postgresqlPassword: teslamate
-
-  ## PostgreSQL Database to create.
-  ##
-  postgresqlDatabase: teslamate
-
-  ## Persistent Volume Storage configuration for PostgreSQL.
-  ##
-  ## Ref: https://kubernetes.io/docs/user-guide/persistent-volumes
-  ##
  persistence:
-    ## Enable PostgreSQL persistence using Persistent Volume Claims.
-    ##
    enabled: true
-
-    ## Persistent Volume Storage Class to be used by PersistentVolumes created
-    ## for PostgreSQL.
-    ##
-    ## If defined, storageClassName: <storageClass>
-    ## If set to "-", storageClassName: "", which disables dynamic provisioning
-    ## If undefined (the default) or set to null, no storageClassName spec is
-    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
-    ##   GKE, AWS & OpenStack)
-    ##
    storageClass:
-
-    ## Persistent Volume Access Mode.
-    ##
    accessModes:
      - ReadWriteOnce
-
-    ## Persistent Volume Storage Size.
-    ##
    size: 8Gi
-
    mountPath: "/data/"
--- a/charts/uptimerobot-prometheus/Chart.yaml
+++ b/charts/uptimerobot-prometheus/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: uptimerobot-prometheus
 description: Prometheus Exporter for the official uptimerobot CLI
 type: application
-version: 2.0.0
+version: 2.0.1
 appVersion: 0.0.1
 keywords:
 - uptimerobot
--- a/charts/uptimerobot-prometheus/templates/service.yaml
+++ b/charts/uptimerobot-prometheus/templates/service.yaml
@@ -4,6 +4,10 @@ metadata:
  name: {{ include "uptimerobot-prometheus.fullname" . }}
  labels:
    {{- include "uptimerobot-prometheus.labels" . | nindent 4 }}
+{{- if .Values.service.annotations }}
+  annotations:
+{{ toYaml .Values.service.annotations | indent 4 }}
+{{- end }}
 spec:
  type: {{ .Values.service.type }}
  ports:
--- a/charts/uptimerobot-prometheus/values.yaml
+++ b/charts/uptimerobot-prometheus/values.yaml
@@ -29,6 +29,10 @@ securityContext: {}
 service:
  type: ClusterIP
  port: 9705
+  # Sometimes you may need to add annotations to the service
+  # to integrate with external operators
+  # annotations:
+    # prometheus.io/scrape: "true"

 resources: {}
  # We usually recommend not to specify default resources and to leave this as a conscious
--- a/charts/zigbee2mqtt/Chart.yaml
+++ b/charts/zigbee2mqtt/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: zigbee2mqtt
 type: application
 description: Bridges events and allows you to control your Zigbee devices via MQTT
-appVersion: 1.14.1
-version: 1.0.0
+appVersion: 1.15.0
+version: 2.0.1
 keywords:
  - zigbee
  - mqtt
--- a/charts/zigbee2mqtt/README.md
+++ b/charts/zigbee2mqtt/README.md
@@ -64,3 +64,21 @@ Alternatively, a YAML file that specifies the values for the above parameters ca
 ```console
 helm install --name my-release -f values.yaml k8s-at-home/zigbee2mqtt
 ```
+
+## Upgrading an existing Release to a new major version
+
+A major chart version change (like 1.0.0 -> 2.0.0) indicates that there is an
+incompatible breaking change needing manual actions.
+
+### Upgrading from 1.x.x to 2.x.x
+
+Zigbee2MQTT has gained a native full-feature WebUI. Because of this, Zigbee2MQTTAssistant was dropped from the chart
+
+You should delete the assistant config from your values.yaml. If you wish to use the new UI, make sure you have
+```
+frontend:
+  port: 8080
+experimental:
+  new_api: true
+```
+in the config section, and enable the ingress in values.yaml. Because of the way this chart works, you'll need to add this section to your configuration.yaml in zigbee2mqtt manually if you want to upgrade in-place
--- a/charts/zigbee2mqtt/templates/NOTES.txt
+++ b/charts/zigbee2mqtt/templates/NOTES.txt
@@ -7,24 +7,26 @@ WARNING: You have not set a network key, which makes zigbee2mqtt run with a well
 Please read https://www.zigbee2mqtt.io/how_tos/how_to_secure_network.html
  {{- end }}
 {{- end }}
-{{- if .Values.assistant.enabled }}
-Get the Z2MA URL by running these commands:
-{{- if .Values.assistant.ingress.enabled }}
-{{- range .Values.assistant.ingress.hosts }}
-  http{{ if $.Values.assistant.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.assistant.ingress.path }}
+{{- if and .Values.config.frontend .Values.config.experimental }}
+{{- if and .Values.config.frontend.port .Values.config.experimental.new_api }}
+Get the Zigbee2MQTT WebUI URL by running these commands:
+{{- if .Values.ingress.enabled }}
+{{- range .Values.ingress.hosts }}
+  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }}
 {{- end }}
-{{- else if contains "NodePort" .Values.assistant.service.type }}
+{{- else if contains "NodePort" .Values.service.type }}
  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "zigbee2mqtt.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.assistant.service.type }}
+{{- 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 svc -w {{ include "zigbee2mqtt.fullname" . }}'
  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "zigbee2mqtt.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-  echo http://$SERVICE_IP:{{ .Values.assistant.service.port }}
-{{- else if contains "ClusterIP" .Values.assistant.service.type }}
+  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 "zigbee2mqtt.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
  echo "Visit http://127.0.0.1:5000 to use your application"
  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 5000:80
 {{- end }}
 {{- end }}
+{{- end }}
--- a/charts/zigbee2mqtt/templates/configmap.yaml
+++ b/charts/zigbee2mqtt/templates/configmap.yaml
@@ -9,40 +9,3 @@ data:
 {{- with .Values.config }}
    {{- toYaml . | nindent 4 }}
 {{- end }}
---
-{{- if .Values.assistant.enabled }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "zigbee2mqtt.fullname" . }}assistant
-  labels:
-{{ include "zigbee2mqtt.labels" . | indent 4 }}
-data:
-  TZ: {{ .Values.timezone | quote }}  
-  {{- $server := default "mqtt://localhost:1883" .Values.config.mqtt.server }}
-  {{- $protocol := (split "://" $server)._0 }}
-  {{- $host := (split ":" (split "://" $server)._1)._0 }}
-  {{- $port := (split ":" $server)._2 }}
-  Z2MA_SETTINGS__MQTTSERVER: {{ $host }}
-  {{- if eq $protocol "mqtts"}}
-  Z2MA_SETTINGS__MQTTSECURE: "true"
-  {{- end }}
-  {{- if $port }}
-  Z2MA_SETTINGS__MQTTPORT: {{ $port }}
-  {{- end }}
-  {{- if .Values.config.mqtt.user }}
-  Z2MA_SETTINGS__MQTTUSERNAME: {{ .Values.config.mqtt.user }}
-  {{- end }}
-  {{- if .Values.config.mqtt.password }}
-  Z2MA_SETTINGS__MQTTPASSWORD: {{ .Values.config.mqtt.password }}
-  {{- end }}
-  {{- if .Values.config.mqtt.base_topic }}
-  Z2MA_SETTINGS__BASETOPIC: {{ .Values.config.mqtt.base_topic }}
-  {{- end }}
-  {{- if and .Values.config.homeassistant .Values.config.advanced.homeassistant_discovery_topic }}
-  Z2MA_SETTINGS__HOMEASSISTANTDISCOVERYBASETOPIC: {{ .Values.config.advanced.homeassistant_discovery_topic }}
-  {{- end }}
-  {{- range $key, $val := .Values.assistant.config }}
-  Z2MA_SETTINGS__{{ $key | upper }}: {{ $val | quote }}
-  {{- end }}
-{{- end }}
--- a/charts/zigbee2mqtt/templates/ingress.yaml
+++ b/charts/zigbee2mqtt/templates/ingress.yaml
@@ -1,20 +1,21 @@
-{{- if and .Values.assistant.enabled .Values.assistant.ingress.enabled -}}
+{{- if and .Values.config.frontend .Values.config.experimental }}
+{{- if and .Values.config.frontend.port .Values.config.experimental.new_api }}
 {{- $fullName := include "zigbee2mqtt.fullname" . -}}
-{{- $ingressPath := .Values.assistant.ingress.path -}}
+{{- $ingressPath := .Values.ingress.path -}}
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
  name: {{ $fullName }}
  labels:
 {{ include "zigbee2mqtt.labels" . | indent 4 }}
-  {{- with .Values.assistant.ingress.annotations }}
+  {{- with .Values.ingress.annotations }}
  annotations:
    {{- toYaml . | nindent 4 }}
  {{- end }}
 spec:
-{{- if .Values.assistant.ingress.tls }}
+{{- if .Values.ingress.tls }}
  tls:
-  {{- range .Values.assistant.ingress.tls }}
+  {{- range .Values.ingress.tls }}
    - hosts:
      {{- range .hosts }}
        - {{ . | quote }}
@@ -23,7 +24,7 @@ spec:
  {{- end }}
 {{- end }}
  rules:
-  {{- range .Values.assistant.ingress.hosts }}
+  {{- range .Values.ingress.hosts }}
    - host: {{ . | quote }}
      http:
        paths:
@@ -32,4 +33,5 @@ spec:
              serviceName: {{ $fullName }}
              servicePort: http
  {{- end }}
-{{- end }}
+{{- end }}
+{{- end }}
--- a/charts/zigbee2mqtt/templates/service.yaml
+++ b/charts/zigbee2mqtt/templates/service.yaml
@@ -1,50 +1,52 @@
-{{- if .Values.assistant.enabled -}}
+{{- if and .Values.config.frontend .Values.config.experimental }}
+{{- if and .Values.config.frontend.port .Values.config.experimental.new_api }}
 apiVersion: v1
 kind: Service
 metadata:
  name: {{ template "zigbee2mqtt.fullname" . }}
  labels:
 {{ include "zigbee2mqtt.labels" . | indent 4 }}
-{{- if .Values.assistant.service.labels }}
-{{ toYaml .Values.assistant.service.labels | indent 4 }}
+{{- if .Values.service.labels }}
+{{ toYaml .Values.service.labels | indent 4 }}
 {{- end }}
-{{- with .Values.assistant.service.annotations }}
+{{- with .Values.service.annotations }}
  annotations:
 {{ toYaml . | indent 4 }}
 {{- end }}
 spec:
-{{- if (or (eq .Values.assistant.service.type "ClusterIP") (empty .Values.assistant.service.type)) }}
+{{- if (or (eq .Values.service.type "ClusterIP") (empty .Values.service.type)) }}
  type: ClusterIP
-  {{- if .Values.assistant.service.clusterIP }}
-  clusterIP: {{ .Values.assistant.service.clusterIP }}
+  {{- if .Values.service.clusterIP }}
+  clusterIP: {{ .Values.service.clusterIP }}
  {{end}}
-{{- else if eq .Values.assistant.service.type "LoadBalancer" }}
-  type: {{ .Values.assistant.service.type }}
-  {{- if .Values.assistant.service.loadBalancerIP }}
-  loadBalancerIP: {{ .Values.assistant.service.loadBalancerIP }}
+{{- else if eq .Values.service.type "LoadBalancer" }}
+  type: {{ .Values.service.type }}
+  {{- if .Values.service.loadBalancerIP }}
+  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
  {{- end }}
-  {{- if .Values.assistant.service.loadBalancerSourceRanges }}
+  {{- if .Values.service.loadBalancerSourceRanges }}
  loadBalancerSourceRanges:
-{{ toYaml .Values.assistant.service.loadBalancerSourceRanges | indent 4 }}
+{{ toYaml .Values.service.loadBalancerSourceRanges | indent 4 }}
  {{- end -}}
 {{- else }}
-  type: {{ .Values.assistant.service.type }}
+  type: {{ .Values.service.type }}
 {{- end }}
-{{- if .Values.assistant.service.externalIPs }}
+{{- if .Values.service.externalIPs }}
  externalIPs:
-{{ toYaml .Values.assistant.service.externalIPs | indent 4 }}
+{{ toYaml .Values.service.externalIPs | indent 4 }}
 {{- end }}
-  {{- if .Values.assistant.service.externalTrafficPolicy }}
-  externalTrafficPolicy: {{ .Values.assistant.service.externalTrafficPolicy }}
+  {{- if .Values.service.externalTrafficPolicy }}
+  externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
  {{- end }}
  ports:
    - name: http
-      port: {{ .Values.assistant.service.port }}
+      port: {{ .Values.service.port }}
      protocol: TCP
      targetPort: http
-{{ if (and (eq .Values.assistant.service.type "NodePort") (not (empty .Values.assistant.service.nodePort))) }}
-      nodePort: {{.Values.assistant.service.nodePort}}
+{{ if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePort))) }}
+      nodePort: {{.Values.service.nodePort}}
 {{ end }}
  selector:
    {{- include "zigbee2mqtt.selectorLabels" . | nindent 4 }}
-{{- end }}
+{{- end }}
+{{- end }}
--- a/charts/zigbee2mqtt/templates/statefullset.yaml
+++ b/charts/zigbee2mqtt/templates/statefullset.yaml
@@ -41,6 +41,14 @@ spec:
        - name: DEBUG
          value: {{ .Values.debug }}
        {{- end }}
+        {{- if and .Values.config.frontend .Values.config.experimental }}
+        {{- if and .Values.config.frontend.port .Values.config.experimental.new_api }}
+        ports:
+        - name: http
+          containerPort: {{ .Values.config.frontend.port }}
+          protocol: TCP
+        {{- end }}
+        {{- end }}
        resources:
          {{- toYaml .Values.resources | nindent 12 }}
        volumeMounts:
@@ -51,34 +59,6 @@ spec:
          mountPath: /data
        - name: sniffer
          mountPath: {{ .Values.config.serial.port }}
-      {{- if .Values.assistant.enabled }}
-      - name: {{ .Chart.Name }}assistant
-        image: "{{ .Values.assistant.image.repository }}:{{ .Values.assistant.image.tag | default "latest" }}"
-        imagePullPolicy: {{ .Values.assistant.image.pullPolicy }}        
-        ports:
-        - name: http
-          containerPort: 80
-          protocol: TCP
-        livenessProbe:
-          httpGet:
-            path: /
-            port: http
-            scheme: HTTP
-          initialDelaySeconds: {{ .Values.assistant.probes.liveness.initialDelaySeconds }}
-          failureThreshold: {{ .Values.assistant.probes.liveness.failureThreshold }}
-          timeoutSeconds: {{ .Values.assistant.probes.liveness.timeoutSeconds }}
-        readinessProbe:
-          httpGet:
-            path: /
-            port: http
-            scheme: HTTP
-          initialDelaySeconds: {{ .Values.assistant.probes.readiness.initialDelaySeconds }}
-          failureThreshold: {{ .Values.assistant.probes.readiness.failureThreshold }}
-          timeoutSeconds: {{ .Values.assistant.probes.readiness.timeoutSeconds }}
-        envFrom:
-        - configMapRef:
-            name: {{ include "zigbee2mqtt.fullname" . }}assistant
-      {{- end }}
      volumes:
      - name: zigbee2mqtt
        configMap:
--- a/charts/zigbee2mqtt/values.yaml
+++ b/charts/zigbee2mqtt/values.yaml
@@ -39,66 +39,45 @@ config:
    log_output:
      - console

-assistant:
-  enabled: true
-  image:
-    repository: carldebilly/zigbee2mqttassistant
-    pullPolicy: IfNotPresent
-    # Overrides the image tag whose default is latest.
-    tag: ""
-  # Config values from https://github.com/yllibed/Zigbee2MqttAssistant
-  # MQTT (connection or topic) parameters are retrieved from general config, but they can be overriden.
-  # All of them are case insensitive.
-  config:
-    lowBatteryThreshold: 30
-    allowJoinTimeout: 20
-    autosetLastSeen: false
-    devicesPollingSchedule: "*/12 * * * *"
-    networkScanSchedule: "0 */3 * * *"
+  # Both of these need to be enabled for the webui
+  frontend:
+    port: 8080
+  experimental:
+    new_api: true

-  probes:
-    liveness:
-      initialDelaySeconds: 30
-      failureThreshold: 5
-      timeoutSeconds: 10
-    readiness:
-      initialDelaySeconds: 30
-      failureThreshold: 5
-      timeoutSeconds: 10
+service:
+  type: ClusterIP
+  port: 8080
+  ## Specify the nodePort value for the LoadBalancer and NodePort service types.
+  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
+  ##
+  # nodePort:
+  ## Provide any additional annotations which may be required. This can be used to
+  ## set the LoadBalancer service type to internal only.
+  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer
+  ##
+  annotations: {}
+  labels: {}
+  ## Use loadBalancerIP to request a specific static IP,
+  ## otherwise leave blank
+  ##
+  loadBalancerIP:
+  # loadBalancerSourceRanges: []
+  ## Set the externalTrafficPolicy in the Service to either Cluster or Local
+  # externalTrafficPolicy: Cluster

-  service:
-    type: ClusterIP
-    port: 8091
-    ## Specify the nodePort value for the LoadBalancer and NodePort service types.
-    ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
-    ##
-    # nodePort:
-    ## Provide any additional annotations which may be required. This can be used to
-    ## set the LoadBalancer service type to internal only.
-    ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer
-    ##
-    annotations: {}
-    labels: {}
-    ## Use loadBalancerIP to request a specific static IP,
-    ## otherwise leave blank
-    ##
-    loadBalancerIP:
-    # loadBalancerSourceRanges: []
-    ## Set the externalTrafficPolicy in the Service to either Cluster or Local
-    # externalTrafficPolicy: Cluster
-
-  ingress:
-    enabled: false
-    annotations: {}
-      # kubernetes.io/ingress.class: nginx
-      # kubernetes.io/tls-acme: "true"
-    path: /
-    hosts:
-      - chart-example.local
-    tls: []
-    #  - secretName: chart-example-tls
-    #    hosts:
-    #      - chart-example.local
+ingress:
+  enabled: false
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  path: /
+  hosts:
+    - chart-example.local
+  tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local

 persistence:
  enabled: false
Author	SHA1	Message	Date
Jeff Billimek	490dc82894	[multiple] Bump various chart image versions (#88 ) * Bump various chart image versions * friagte: 0.6.0 * home-assistant: 0.116.1 * plex: 1.20.2.3402-0fec14d92 * teslamate: 1.20.0 Signed-off-by: Jeff Billimek <jeff@billimek.com> * fix teslamate postgres dependency chart Signed-off-by: Jeff Billimek <jeff@billimek.com> * remove global reference Signed-off-by: Jeff Billimek <jeff@billimek.com>	2020-10-09 13:16:16 -04:00
Hugo Fonseca	8be3edfc59	[Adguard-home] Allow to mount secret with certs so we can set the tls … (#87 ) * Adguard-home: Allow to mount secret with certs so we can set the tls configs with these * adguard-home bump to 2.2.0	2020-10-08 15:38:10 -04:00
Denis	eb2f4bac88	[uptimerobot-prometheus] Support annotations in Service (#86 ) * bump chart version * [uptimerobot-prometheus] Support annotations in Service (#1) * add annotations to service * add example annotations to values.yaml * fix trailing spaces	2020-10-07 13:26:13 -04:00
Ryan Holt	7f1f2b9150	Merge pull request #84 from CuBiC3D/master [media-common] Fixes HELM error on extraIngresses	2020-10-07 11:25:44 -04:00
Waldemar Faist	4bde4fa33f	Fixes HELM error on extraIngresses Signed-off-by: Waldemar Faist <cubic@coldice.net>	2020-10-07 14:01:34 +02:00
Piotr Maksymiuk	2e541d77e5	[zigbee2mqtt] Chart version bump (#81 )	2020-10-04 14:19:18 -04:00
Piotr Maksymiuk	e60063a352	[zigbee2mqtt] Version 1.15, new UI (#80 )	2020-10-04 13:23:07 -04:00
Ryan Holt	e19708e37d	[adguard-home] fix svc path (#79 ) Signed-off-by: Ryan Holt <ryan@ryanholt.net>	2020-10-02 16:44:11 -04:00
Ryan Holt	3258774c07	[adguard-home] enable additional service options (#77 )	2020-10-02 16:11:05 -04:00