Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(home): upgrade zigbee2mqtt helmrelease #2221

Merged
merged 2 commits into from
Dec 26, 2023
Merged

feat(home): upgrade zigbee2mqtt helmrelease #2221

merged 2 commits into from
Dec 26, 2023

Conversation

blackjid
Copy link
Owner

No description provided.

@bot-x-mod
Copy link
Contributor

bot-x-mod bot commented Dec 26, 2023

--- HelmRelease: home/zigbee2mqtt Service: home/zigbee2mqtt

+++ HelmRelease: home/zigbee2mqtt Service: home/zigbee2mqtt

@@ -1,21 +1,22 @@

 ---
 apiVersion: v1
 kind: Service
 metadata:
   name: zigbee2mqtt
   labels:
-    app.kubernetes.io/service: zigbee2mqtt
     app.kubernetes.io/instance: zigbee2mqtt
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: zigbee2mqtt
+    app.kubernetes.io/service: zigbee2mqtt
 spec:
   type: ClusterIP
   ports:
   - port: 80
-    targetPort: http
+    targetPort: 80
     protocol: TCP
     name: http
   selector:
+    app.kubernetes.io/component: main
     app.kubernetes.io/instance: zigbee2mqtt
     app.kubernetes.io/name: zigbee2mqtt
 
--- HelmRelease: home/zigbee2mqtt StatefulSet: home/zigbee2mqtt

+++ HelmRelease: home/zigbee2mqtt StatefulSet: home/zigbee2mqtt

@@ -1,162 +0,0 @@

----
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: zigbee2mqtt
-  labels:
-    app.kubernetes.io/instance: zigbee2mqtt
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/name: zigbee2mqtt
-  annotations:
-    reloader.stakater.com/auto: 'true'
-spec:
-  revisionHistoryLimit: 3
-  replicas: 1
-  podManagementPolicy: OrderedReady
-  updateStrategy:
-    type: RollingUpdate
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: zigbee2mqtt
-      app.kubernetes.io/instance: zigbee2mqtt
-  serviceName: zigbee2mqtt
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: zigbee2mqtt
-        app.kubernetes.io/instance: zigbee2mqtt
-    spec:
-      serviceAccountName: default
-      automountServiceAccountToken: true
-      securityContext:
-        fsGroup: 568
-        fsGroupChangePolicy: OnRootMismatch
-        runAsGroup: 568
-        runAsUser: 568
-        supplementalGroups:
-        - 20
-      dnsPolicy: ClusterFirst
-      enableServiceLinks: true
-      containers:
-      - name: zigbee2mqtt
-        image: ghcr.io/koenkk/zigbee2mqtt:1.34.0
-        imagePullPolicy: null
-        securityContext:
-          privileged: true
-        env:
-        - name: TZ
-          value: America/Santiago
-        - name: ZIGBEE2MQTT_CONFIG_ADVANCED_HOMEASSISTANT_DISCOVERY_TOPIC
-          value: homeassistant
-        - name: ZIGBEE2MQTT_CONFIG_ADVANCED_HOMEASSISTANT_LEGACY_ENTITY_ATTRIBUTES
-          value: 'false'
-        - name: ZIGBEE2MQTT_CONFIG_ADVANCED_HOMEASSISTANT_LEGACY_TRIGGERS
-          value: 'false'
-        - name: ZIGBEE2MQTT_CONFIG_ADVANCED_HOMEASSISTANT_STATUS_TOPIC
-          value: homeassistant/status
-        - name: ZIGBEE2MQTT_CONFIG_ADVANCED_LAST_SEEN
-          value: ISO_8601
-        - name: ZIGBEE2MQTT_CONFIG_ADVANCED_LEGACY_API
-          value: 'false'
-        - name: ZIGBEE2MQTT_CONFIG_ADVANCED_LEGACY_AVAILABILITY_PAYLOAD
-          value: 'false'
-        - name: ZIGBEE2MQTT_CONFIG_ADVANCED_LOG_LEVEL
-          value: info
-        - name: ZIGBEE2MQTT_CONFIG_ADVANCED_LOG_OUTPUT
-          value: '["console"]'
-        - name: ZIGBEE2MQTT_CONFIG_AVAILABILITY_ACTIVE_TIMEOUT
-          value: '60'
-        - name: ZIGBEE2MQTT_CONFIG_AVAILABILITY_PASSIVE_TIMEOUT
-          value: '2000'
-        - name: ZIGBEE2MQTT_CONFIG_DEVICE_OPTIONS_LEGACY
-          value: 'false'
-        - name: ZIGBEE2MQTT_CONFIG_DEVICE_OPTIONS_RETAIN
-          value: 'true'
-        - name: ZIGBEE2MQTT_CONFIG_EXPERIMENTAL_NEW_API
-          value: 'true'
-        - name: ZIGBEE2MQTT_CONFIG_FRONTEND_PORT
-          value: '80'
-        - name: ZIGBEE2MQTT_CONFIG_FRONTEND_URL
-          value: https://zigbee.donoso.family
-        - name: ZIGBEE2MQTT_CONFIG_HOMEASSISTANT
-          value: 'true'
-        - name: ZIGBEE2MQTT_CONFIG_MQTT_INCLUDE_DEVICE_INFORMATION
-          value: 'true'
-        - name: ZIGBEE2MQTT_CONFIG_MQTT_KEEPALIVE
-          value: '60'
-        - name: ZIGBEE2MQTT_CONFIG_MQTT_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              key: emqx-password
-              name: zigbee2mqtt-secret
-        - name: ZIGBEE2MQTT_CONFIG_MQTT_REJECT_UNAUTHORIZED
-          value: 'true'
-        - name: ZIGBEE2MQTT_CONFIG_MQTT_SERVER
-          value: mqtt://emqx.home.svc.cluster.local
-        - name: ZIGBEE2MQTT_CONFIG_MQTT_USER
-          valueFrom:
-            secretKeyRef:
-              key: emqx-username
-              name: zigbee2mqtt-secret
-        - name: ZIGBEE2MQTT_CONFIG_MQTT_VERSION
-          value: '5'
-        - name: ZIGBEE2MQTT_CONFIG_PERMIT_JOIN
-          value: 'false'
-        - name: ZIGBEE2MQTT_CONFIG_SERIAL_PORT
-          value: /dev/serial/by-id/usb-1a86_USB_Serial-if00-port0
-        - name: ZIGBEE2MQTT_DATA
-          value: /config
-        ports:
-        - name: http
-          containerPort: 80
-          protocol: TCP
-        volumeMounts:
-        - name: usb
-          mountPath: /dev/serial/by-id/usb-1a86_USB_Serial-if00-port0
-        - mountPath: /config
-          name: config
-        livenessProbe:
-          failureThreshold: 3
-          initialDelaySeconds: 0
-          periodSeconds: 10
-          tcpSocket:
-            port: 80
-          timeoutSeconds: 1
-        readinessProbe:
-          failureThreshold: 3
-          initialDelaySeconds: 0
-          periodSeconds: 10
-          tcpSocket:
-            port: 80
-          timeoutSeconds: 1
-        startupProbe:
-          failureThreshold: 30
-          initialDelaySeconds: 0
-          periodSeconds: 5
-          tcpSocket:
-            port: 80
-          timeoutSeconds: 1
-        resources:
-          limits:
-            memory: 500Mi
-          requests:
-            cpu: 10m
-            memory: 100Mi
-      volumes:
-      - name: usb
-        hostPath:
-          path: /dev/serial/by-id/usb-1a86_USB_Serial-if00-port0
-          type: CharDevice
-      nodeSelector:
-        zzh.feature.node.kubernetes.io/zigbee: 'true'
-  volumeClaimTemplates:
-  - metadata:
-      name: config
-    spec:
-      accessModes:
-      - ReadWriteOnce
-      resources:
-        requests:
-          storage: 1Gi
-      storageClassName: ceph-block
-
--- HelmRelease: home/zigbee2mqtt Ingress: home/zigbee2mqtt

+++ HelmRelease: home/zigbee2mqtt Ingress: home/zigbee2mqtt

@@ -4,21 +4,29 @@

 metadata:
   name: zigbee2mqtt
   labels:
     app.kubernetes.io/instance: zigbee2mqtt
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: zigbee2mqtt
-  annotations:
-    external-dns.alpha.kubernetes.io/target: ingress.donoso.family
-    hajimari.io/icon: mdi:zigbee
 spec:
-  ingressClassName: nginx
+  ingressClassName: internal
   tls:
   - hosts:
+    - zigbee2mqtt.donoso.family
     - zigbee.donoso.family
   rules:
+  - host: zigbee2mqtt.donoso.family
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: zigbee2mqtt
+            port:
+              number: 80
   - host: zigbee.donoso.family
     http:
       paths:
       - path: /
         pathType: Prefix
         backend:
--- HelmRelease: home/zigbee2mqtt Deployment: home/zigbee2mqtt

+++ HelmRelease: home/zigbee2mqtt Deployment: home/zigbee2mqtt

@@ -0,0 +1,138 @@

+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: zigbee2mqtt
+  labels:
+    app.kubernetes.io/component: main
+    app.kubernetes.io/instance: zigbee2mqtt
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: zigbee2mqtt
+  annotations:
+    reloader.stakater.com/auto: 'true'
+spec:
+  revisionHistoryLimit: 3
+  replicas: 1
+  strategy:
+    type: Recreate
+  selector:
+    matchLabels:
+      app.kubernetes.io/component: main
+      app.kubernetes.io/name: zigbee2mqtt
+      app.kubernetes.io/instance: zigbee2mqtt
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/component: main
+        app.kubernetes.io/instance: zigbee2mqtt
+        app.kubernetes.io/name: zigbee2mqtt
+    spec:
+      enableServiceLinks: true
+      serviceAccountName: default
+      automountServiceAccountToken: true
+      securityContext:
+        fsGroup: 568
+        fsGroupChangePolicy: OnRootMismatch
+        runAsGroup: 568
+        runAsNonRoot: true
+        runAsUser: 568
+      hostIPC: false
+      hostNetwork: false
+      hostPID: false
+      dnsPolicy: ClusterFirst
+      containers:
+      - env:
+        - name: TZ
+          value: America/Santiago
+        - name: ZIGBEE2MQTT_CONFIG_ADVANCED_HOMEASSISTANT_DISCOVERY_TOPIC
+          value: homeassistant
+        - name: ZIGBEE2MQTT_CONFIG_ADVANCED_HOMEASSISTANT_LEGACY_ENTITY_ATTRIBUTES
+          value: 'false'
+        - name: ZIGBEE2MQTT_CONFIG_ADVANCED_HOMEASSISTANT_LEGACY_TRIGGERS
+          value: 'false'
+        - name: ZIGBEE2MQTT_CONFIG_ADVANCED_HOMEASSISTANT_STATUS_TOPIC
+          value: homeassistant/status
+        - name: ZIGBEE2MQTT_CONFIG_ADVANCED_LAST_SEEN
+          value: ISO_8601
+        - name: ZIGBEE2MQTT_CONFIG_ADVANCED_LEGACY_API
+          value: 'false'
+        - name: ZIGBEE2MQTT_CONFIG_ADVANCED_LEGACY_AVAILABILITY_PAYLOAD
+          value: 'false'
+        - name: ZIGBEE2MQTT_CONFIG_ADVANCED_LOG_LEVEL
+          value: info
+        - name: ZIGBEE2MQTT_CONFIG_ADVANCED_LOG_OUTPUT
+          value: '["console"]'
+        - name: ZIGBEE2MQTT_CONFIG_AVAILABILITY_ACTIVE_TIMEOUT
+          value: '60'
+        - name: ZIGBEE2MQTT_CONFIG_AVAILABILITY_PASSIVE_TIMEOUT
+          value: '2000'
+        - name: ZIGBEE2MQTT_CONFIG_DEVICE_OPTIONS_LEGACY
+          value: 'false'
+        - name: ZIGBEE2MQTT_CONFIG_DEVICE_OPTIONS_RETAIN
+          value: 'true'
+        - name: ZIGBEE2MQTT_CONFIG_EXPERIMENTAL_NEW_API
+          value: 'true'
+        - name: ZIGBEE2MQTT_CONFIG_FRONTEND_PORT
+          value: '80'
+        - name: ZIGBEE2MQTT_CONFIG_FRONTEND_URL
+          value: https://zigbee.donoso.family
+        - name: ZIGBEE2MQTT_CONFIG_HOMEASSISTANT
+          value: 'true'
+        - name: ZIGBEE2MQTT_CONFIG_MQTT_INCLUDE_DEVICE_INFORMATION
+          value: 'true'
+        - name: ZIGBEE2MQTT_CONFIG_MQTT_KEEPALIVE
+          value: '60'
+        - name: ZIGBEE2MQTT_CONFIG_MQTT_REJECT_UNAUTHORIZED
+          value: 'true'
+        - name: ZIGBEE2MQTT_CONFIG_MQTT_SERVER
+          value: mqtt://emqx.home.svc.cluster.local
+        - name: ZIGBEE2MQTT_CONFIG_MQTT_VERSION
+          value: '5'
+        - name: ZIGBEE2MQTT_DATA
+          value: /config
+        envFrom:
+        - secretRef:
+            name: zigbee2mqtt-secret
+        image: ghcr.io/koenkk/zigbee2mqtt:1.34.0@sha256:7f6fca6f19a0bed1a33cecbdd841a91e28e1a1842e268b1abb544e120aaf88e6
+        livenessProbe:
+          failureThreshold: 3
+          initialDelaySeconds: 0
+          periodSeconds: 10
+          tcpSocket:
+            port: 80
+          timeoutSeconds: 1
+        name: main
+        readinessProbe:
+          failureThreshold: 3
+          initialDelaySeconds: 0
+          periodSeconds: 10
+          tcpSocket:
+            port: 80
+          timeoutSeconds: 1
+        resources:
+          limits:
+            memory: 512Mi
+          requests:
+            cpu: 10m
+            memory: 128Mi
+        securityContext:
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+            - ALL
+          readOnlyRootFilesystem: true
+        startupProbe:
+          failureThreshold: 30
+          initialDelaySeconds: 0
+          periodSeconds: 5
+          tcpSocket:
+            port: 80
+          timeoutSeconds: 1
+        volumeMounts:
+        - mountPath: /config
+          name: config
+      volumes:
+      - name: config
+        persistentVolumeClaim:
+          claimName: config-zigbee2mqtt-0
+

@bot-x-mod
Copy link
Contributor

bot-x-mod bot commented Dec 26, 2023

--- kubernetes/main/apps/home/zwave-js-ui/app Kustomization: flux-system/zwave-js-ui HelmRelease: home/zwave-js-ui

+++ kubernetes/main/apps/home/zwave-js-ui/app Kustomization: flux-system/zwave-js-ui HelmRelease: home/zwave-js-ui

@@ -18,13 +18,13 @@

         namespace: flux-system
       version: 2.4.0
   dependsOn:
   - name: rook-ceph-cluster
     namespace: rook-ceph
   - name: volsync
-    namespace: storage
+    namespace: volsync
   install:
     remediation:
       retries: 3
   interval: 30m
   uninstall:
     keepHistory: false
--- kubernetes/main/apps/home/zigbee2mqtt/app Kustomization: flux-system/zigbee2mqtt ExternalSecret: home/zigbee2mqtt

+++ kubernetes/main/apps/home/zigbee2mqtt/app Kustomization: flux-system/zigbee2mqtt ExternalSecret: home/zigbee2mqtt

@@ -8,14 +8,26 @@

     kustomize.toolkit.fluxcd.io/namespace: flux-system
   name: zigbee2mqtt
   namespace: home
 spec:
   dataFrom:
   - extract:
+      key: emqx
+  - extract:
       key: zigbee2mqtt
   secretStoreRef:
     kind: ClusterSecretStore
     name: onepassword-connect
   target:
-    creationPolicy: Owner
     name: zigbee2mqtt-secret
+    template:
+      data:
+        ZIGBEE2MQTT_CONFIG_ADVANCED_EXT_PAN_ID: '{{ .ZIGBEE2MQTT_CONFIG_ADVANCED_EXT_PAN_ID
+          }}'
+        ZIGBEE2MQTT_CONFIG_ADVANCED_NETWORK_KEY: '{{ .ZIGBEE2MQTT_CONFIG_ADVANCED_NETWORK_KEY
+          }}'
+        ZIGBEE2MQTT_CONFIG_ADVANCED_PAN_ID: '{{ .ZIGBEE2MQTT_CONFIG_ADVANCED_PAN_ID
+          }}'
+        ZIGBEE2MQTT_CONFIG_MQTT_PASSWORD: '{{ .EMQX_MQTT_PASSWORD }}'
+        ZIGBEE2MQTT_CONFIG_MQTT_USER: '{{ .EMQX_MQTT_USERNAME }}'
+      engineVersion: v2
 
--- kubernetes/main/apps/home/zigbee2mqtt/app Kustomization: flux-system/zigbee2mqtt HelmRelease: home/zigbee2mqtt

+++ kubernetes/main/apps/home/zigbee2mqtt/app Kustomization: flux-system/zigbee2mqtt HelmRelease: home/zigbee2mqtt

@@ -13,114 +13,112 @@

     spec:
       chart: app-template
       sourceRef:
         kind: HelmRepository
         name: bjw-s
         namespace: flux-system
-      version: 1.5.1
+      version: 2.4.0
+  dependsOn:
+  - name: emqx-operator
+    namespace: home
+  - name: rook-ceph-cluster
+    namespace: rook-ceph
+  - name: volsync
+    namespace: volsync
   install:
-    createNamespace: true
     remediation:
       retries: 3
-  interval: 15m
-  maxHistory: 2
+  interval: 30m
   uninstall:
     keepHistory: false
   upgrade:
     cleanupOnFail: true
     remediation:
       retries: 3
   values:
-    controller:
-      annotations:
-        reloader.stakater.com/auto: 'true'
-      type: statefulset
-    env:
-      TZ: America/Santiago
-      ZIGBEE2MQTT_CONFIG_ADVANCED_HOMEASSISTANT_DISCOVERY_TOPIC: homeassistant
-      ZIGBEE2MQTT_CONFIG_ADVANCED_HOMEASSISTANT_LEGACY_ENTITY_ATTRIBUTES: 'false'
-      ZIGBEE2MQTT_CONFIG_ADVANCED_HOMEASSISTANT_LEGACY_TRIGGERS: 'false'
-      ZIGBEE2MQTT_CONFIG_ADVANCED_HOMEASSISTANT_STATUS_TOPIC: homeassistant/status
-      ZIGBEE2MQTT_CONFIG_ADVANCED_LAST_SEEN: ISO_8601
-      ZIGBEE2MQTT_CONFIG_ADVANCED_LEGACY_API: 'false'
-      ZIGBEE2MQTT_CONFIG_ADVANCED_LEGACY_AVAILABILITY_PAYLOAD: 'false'
-      ZIGBEE2MQTT_CONFIG_ADVANCED_LOG_LEVEL: info
-      ZIGBEE2MQTT_CONFIG_ADVANCED_LOG_OUTPUT: '["console"]'
-      ZIGBEE2MQTT_CONFIG_AVAILABILITY_ACTIVE_TIMEOUT: 60
-      ZIGBEE2MQTT_CONFIG_AVAILABILITY_PASSIVE_TIMEOUT: 2000
-      ZIGBEE2MQTT_CONFIG_DEVICE_OPTIONS_LEGACY: 'false'
-      ZIGBEE2MQTT_CONFIG_DEVICE_OPTIONS_RETAIN: 'true'
-      ZIGBEE2MQTT_CONFIG_EXPERIMENTAL_NEW_API: 'true'
-      ZIGBEE2MQTT_CONFIG_FRONTEND_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_PASSWORD:
-        valueFrom:
-          secretKeyRef:
-            key: emqx-password
-            name: zigbee2mqtt-secret
-      ZIGBEE2MQTT_CONFIG_MQTT_REJECT_UNAUTHORIZED: 'true'
-      ZIGBEE2MQTT_CONFIG_MQTT_SERVER: mqtt://emqx.home.svc.cluster.local
-      ZIGBEE2MQTT_CONFIG_MQTT_USER:
-        valueFrom:
-          secretKeyRef:
-            key: emqx-username
-            name: zigbee2mqtt-secret
-      ZIGBEE2MQTT_CONFIG_MQTT_VERSION: 5
-      ZIGBEE2MQTT_CONFIG_PERMIT_JOIN: 'false'
-      ZIGBEE2MQTT_CONFIG_SERIAL_PORT: /dev/serial/by-id/usb-1a86_USB_Serial-if00-port0
-      ZIGBEE2MQTT_DATA: /config
-    image:
-      repository: ghcr.io/koenkk/zigbee2mqtt
-      tag: 1.34.0
+    controllers:
+      main:
+        annotations:
+          reloader.stakater.com/auto: 'true'
+        containers:
+          main:
+            env:
+              TZ: America/Santiago
+              ZIGBEE2MQTT_CONFIG_ADVANCED_HOMEASSISTANT_DISCOVERY_TOPIC: homeassistant
+              ZIGBEE2MQTT_CONFIG_ADVANCED_HOMEASSISTANT_LEGACY_ENTITY_ATTRIBUTES: 'false'
+              ZIGBEE2MQTT_CONFIG_ADVANCED_HOMEASSISTANT_LEGACY_TRIGGERS: 'false'
+              ZIGBEE2MQTT_CONFIG_ADVANCED_HOMEASSISTANT_STATUS_TOPIC: homeassistant/status
+              ZIGBEE2MQTT_CONFIG_ADVANCED_LAST_SEEN: ISO_8601
+              ZIGBEE2MQTT_CONFIG_ADVANCED_LEGACY_API: 'false'
+              ZIGBEE2MQTT_CONFIG_ADVANCED_LEGACY_AVAILABILITY_PAYLOAD: 'false'
+              ZIGBEE2MQTT_CONFIG_ADVANCED_LOG_LEVEL: info
+              ZIGBEE2MQTT_CONFIG_ADVANCED_LOG_OUTPUT: '["console"]'
+              ZIGBEE2MQTT_CONFIG_AVAILABILITY_ACTIVE_TIMEOUT: 60
+              ZIGBEE2MQTT_CONFIG_AVAILABILITY_PASSIVE_TIMEOUT: 2000
+              ZIGBEE2MQTT_CONFIG_DEVICE_OPTIONS_LEGACY: 'false'
+              ZIGBEE2MQTT_CONFIG_DEVICE_OPTIONS_RETAIN: 'true'
+              ZIGBEE2MQTT_CONFIG_EXPERIMENTAL_NEW_API: 'true'
+              ZIGBEE2MQTT_CONFIG_FRONTEND_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_VERSION: 5
+              ZIGBEE2MQTT_DATA: /config
+            envFrom:
+            - secretRef:
+                name: zigbee2mqtt-secret
+            image:
+              repository: ghcr.io/koenkk/zigbee2mqtt
+              tag: 1.34.0@sha256:7f6fca6f19a0bed1a33cecbdd841a91e28e1a1842e268b1abb544e120aaf88e6
+            resources:
+              limits:
+                memory: 512Mi
+              requests:
+                cpu: 10m
+                memory: 128Mi
+            securityContext:
+              allowPrivilegeEscalation: false
+              capabilities:
+                drop:
+                - ALL
+              readOnlyRootFilesystem: true
+        pod:
+          securityContext:
+            fsGroup: 568
+            fsGroupChangePolicy: OnRootMismatch
+            runAsGroup: 568
+            runAsNonRoot: true
+            runAsUser: 568
     ingress:
       main:
-        annotations:
-          external-dns.alpha.kubernetes.io/target: ingress.donoso.family
-          hajimari.io/icon: mdi:zigbee
+        className: internal
         enabled: true
         hosts:
+        - host: '{{ .Release.Name }}.donoso.family'
+          paths:
+          - path: /
+            service:
+              name: main
+              port: http
         - host: zigbee.donoso.family
           paths:
           - path: /
-            pathType: Prefix
-        ingressClassName: nginx
+            service:
+              name: main
+              port: http
         tls:
         - hosts:
+          - '{{ .Release.Name }}.donoso.family'
           - zigbee.donoso.family
-    nodeSelector:
-      zzh.feature.node.kubernetes.io/zigbee: 'true'
     persistence:
-      usb:
+      config:
         enabled: true
-        hostPath: /dev/serial/by-id/usb-1a86_USB_Serial-if00-port0
-        hostPathType: CharDevice
-        type: hostPath
-    podSecurityContext:
-      fsGroup: 568
-      fsGroupChangePolicy: OnRootMismatch
-      runAsGroup: 568
-      runAsUser: 568
-      supplementalGroups:
-      - 20
-    resources:
-      limits:
-        memory: 500Mi
-      requests:
-        cpu: 10m
-        memory: 100Mi
-    securityContext:
-      privileged: true
+        existingClaim: config-zigbee2mqtt-0
     service:
       main:
         ports:
           http:
             port: 80
-    volumeClaimTemplates:
-    - accessMode: ReadWriteOnce
-      mountPath: /config
-      name: config
-      size: 1Gi
-      storageClass: ceph-block
 

@blackjid blackjid merged commit badf020 into main Dec 26, 2023
5 checks passed
@blackjid blackjid deleted the upgrade_zigbee branch December 26, 2023 23:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant