feat(media/zigbee): migrate zigbee

blackjid · Jun 24, 2024 · 000e368 · 000e368
1 parent 30422fb
commit 000e368
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 100 deletions.
diff --git a/kubernetes/apps/home/kustomization.yaml b/kubernetes/apps/home/kustomization.yaml
@@ -7,4 +7,5 @@ resources:
   - ./namespace.yaml
   # Flux-Kustomizations
   - ./home-assistant/ks.yaml
+  - ./zigbee2mqtt/ks.yaml
   - ./zwave/ks.yaml
diff --git a/kubernetes/apps/home/zigbee2mqtt/app/externalsecret.yaml b/kubernetes/apps/home/zigbee2mqtt/app/externalsecret.yaml
@@ -16,8 +16,8 @@ spec:
         ZIGBEE2MQTT_CONFIG_ADVANCED_EXT_PAN_ID: "{{ .ZIGBEE2MQTT_CONFIG_ADVANCED_EXT_PAN_ID }}"
         ZIGBEE2MQTT_CONFIG_ADVANCED_PAN_ID: "{{ .ZIGBEE2MQTT_CONFIG_ADVANCED_PAN_ID }}"
         ZIGBEE2MQTT_CONFIG_ADVANCED_NETWORK_KEY: "{{ .ZIGBEE2MQTT_CONFIG_ADVANCED_NETWORK_KEY }}"
-        ZIGBEE2MQTT_CONFIG_MQTT_USER: "{{ .EMQX_MQTT_USERNAME }}"
-        ZIGBEE2MQTT_CONFIG_MQTT_PASSWORD: "{{ .EMQX_MQTT_PASSWORD }}"
+        ZIGBEE2MQTT_CONFIG_MQTT_USER: "{{ .X_EMQX_MQTT_USERNAME }}"
+        ZIGBEE2MQTT_CONFIG_MQTT_PASSWORD: "{{ .X_EMQX_MQTT_PASSWORD }}"
   dataFrom:
     - extract:
         key: emqx

diff --git a/kubernetes/apps/home/zigbee2mqtt/app/helmrelease.yaml b/kubernetes/apps/home/zigbee2mqtt/app/helmrelease.yaml
@@ -1,6 +1,6 @@
 ---
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2.schema.json
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: zigbee2mqtt
@@ -9,7 +9,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.4.0
+      version: 3.2.1
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -20,26 +20,23 @@ spec:
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
-  uninstall:
-    keepHistory: false
   dependsOn:
-    - name: emqx
-      namespace: home
-    - name: rook-ceph-cluster
-      namespace: rook-ceph
+    - name: longhorn
+      namespace: longhorn-system
     - name: volsync
-      namespace: volsync
+      namespace: volsync-system
   values:
     controllers:
-      main:
+      zigbee2mqtt:
         annotations:
           reloader.stakater.com/auto: "true"
         containers:
-          main:
+          app:
             image:
               repository: ghcr.io/koenkk/zigbee2mqtt
-              tag: 1.35.2@sha256:131560ae1e3f859159d677aebe89443760483f5310e0885e258383f416be4329
+              tag: 1.38.0@sha256:8a893949ab01ea25fe1189a02a24f7fee3d7e8717d0973bd3dd6989a3a45a6bf
             env:
               TZ: America/Santiago
               ZIGBEE2MQTT_DATA: /config
@@ -57,77 +54,63 @@ spec:
               ZIGBEE2MQTT_CONFIG_DEVICE_OPTIONS_LEGACY: "false"
               ZIGBEE2MQTT_CONFIG_DEVICE_OPTIONS_RETAIN: "true"
               ZIGBEE2MQTT_CONFIG_EXPERIMENTAL_NEW_API: "true"
-              ZIGBEE2MQTT_CONFIG_FRONTEND: "false"
               ZIGBEE2MQTT_CONFIG_FRONTEND_PORT: &port 80
               ZIGBEE2MQTT_CONFIG_FRONTEND_URL: https://zigbee.donoso.family
               ZIGBEE2MQTT_CONFIG_HOMEASSISTANT: "true"
               ZIGBEE2MQTT_CONFIG_MQTT_INCLUDE_DEVICE_INFORMATION: "true"
               ZIGBEE2MQTT_CONFIG_MQTT_KEEPALIVE: 60
               ZIGBEE2MQTT_CONFIG_MQTT_REJECT_UNAUTHORIZED: "true"
-              ZIGBEE2MQTT_CONFIG_MQTT_SERVER: mqtt://emqx.home.svc.cluster.local
+              ZIGBEE2MQTT_CONFIG_MQTT_SERVER: mqtt://emqx-listeners.database.svc.cluster.local:1883
               ZIGBEE2MQTT_CONFIG_MQTT_VERSION: 5
               ZIGBEE2MQTT_CONFIG_PERMIT_JOIN: "false"
               ZIGBEE2MQTT_CONFIG_SERIAL_PORT: &serial-port /dev/serial/by-id/usb-1a86_USB_Serial-if00-port0
             envFrom:
               - secretRef:
                   name: zigbee2mqtt-secret
+            probes:
+              liveness:
+                enabled: true
+              readiness:
+                enabled: true
+              startup:
+                enabled: true
+                spec:
+                  failureThreshold: 30
+                  periodSeconds: 10
             securityContext:
               privileged: true
-              readOnlyRootFilesystem: true
-              capabilities: { drop: ["ALL"] }
             resources:
               requests:
                 cpu: 10m
-                memory: 128Mi
               limits:
                 memory: 512Mi
         pod:
           nodeSelector:
             zzh.feature.node.kubernetes.io/zigbee: "true"
-          securityContext:
-            runAsUser: 568
-            runAsGroup: 20
-            runAsNonRoot: true
-            fsGroup: 568
-            fsGroupChangePolicy: OnRootMismatch
     service:
-      main:
+      app:
+        controller: zigbee2mqtt
         ports:
           http:
             port: *port
     ingress:
-      main:
-        enabled: true
-        className: external
+      app:
         annotations:
-          external-dns.alpha.kubernetes.io/target: ingress.donoso.family
-          nginx.ingress.kubernetes.io/auth-url: "https://auth.donoso.family/oauth2/auth"
-          nginx.ingress.kubernetes.io/auth-signin: https://auth.donoso.family/oauth2/start
-          hajimari.io/icon: mdi:z-wave
+          external-dns.alpha.kubernetes.io/target: internal.donoso.family
+        className: internal
         hosts:
-          - host: &host "{{ .Release.Name }}.donoso.family"
+          - host: zigbee.donoso.family
             paths:
               - path: /
                 service:
-                  name: main
+                  identifier: app
                   port: http
-          - host: &customHost "zigbee.donoso.family"
-            paths:
-              - path: /
-                service:
-                  name: main
-                  port: http
-        tls:
-          - hosts:
-              - *host
-              - *customHost
     persistence:
       config:
-        enabled: true
-        existingClaim: config-zigbee2mqtt-0
+        existingClaim: zigbee2mqtt
       usb:
         type: hostPath
-        hostPath: *serial-port
+        hostPath: /dev/serial/by-id/usb-1a86_USB_Serial-if00-port0
         hostPathType: CharDevice
         globalMounts:
-          - path: *serial-port
+          - path: /dev/serial/by-id/usb-1a86_USB_Serial-if00-port0
diff --git a/kubernetes/apps/home/zigbee2mqtt/app/kustomization.yaml b/kubernetes/apps/home/zigbee2mqtt/app/kustomization.yaml
@@ -2,8 +2,7 @@
 # yaml-language-server: $schema=https://json.schemastore.org/kustomization
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: home
 resources:
   - ./externalsecret.yaml
   - ./helmrelease.yaml
-  - ./volsync.yaml
+  - ../../../../templates/volsync
diff --git a/kubernetes/apps/home/zigbee2mqtt/app/resources/lokirule.yaml b/kubernetes/apps/home/zigbee2mqtt/app/resources/lokirule.yaml
@@ -0,0 +1,14 @@
+---
+groups:
+  - name: zigbee2mqtt
+    rules:
+      - alert: ZigbeeMQTTUnreachable
+        expr: |
+          sum(count_over_time({app="zigbee2mqtt"} |~ "(?i)not connected to mqtt server"[2m])) > 0
+        for: 2m
+        labels:
+          severity: critical
+          category: logs
+        annotations:
+          app: "{{ $labels.app }}"
+          summary: "{{ $labels.app }} is unable to reach MQTT"
diff --git a/kubernetes/apps/home/zigbee2mqtt/app/volsync.yaml b/kubernetes/apps/home/zigbee2mqtt/app/volsync.yaml
diff --git a/kubernetes/apps/home/zigbee2mqtt/ks.yaml b/kubernetes/apps/home/zigbee2mqtt/ks.yaml
@@ -11,8 +11,9 @@ spec:
     labels:
       app.kubernetes.io/name: *app
   dependsOn:
+    - name: emqx-cluster
     - name: external-secrets-stores
-  path: ./kubernetes/main/apps/home/zigbee2mqtt/app
+  path: ./kubernetes/apps/home/zigbee2mqtt/app
   prune: true
   sourceRef:
     kind: GitRepository
@@ -21,3 +22,7 @@ spec:
   interval: 30m
   retryInterval: 1m
   timeout: 5m
+  postBuild:
+    substitute:
+      APP: *app
+      VOLSYNC_CAPACITY: 1Gi