From 84d4e173306f96d7a4bffd1947387447b7d1b447 Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Fri, 18 Mar 2022 23:27:58 +0200
Subject: [PATCH] fix(zigbee2mqtt): Expose gui option to set usbdevice path
 (#2213)

* fix(zigbee2mqtt): Don't put `serial` into config file, so app can start

* try installing

* test bad config

* test ci

* no bad config

* whoops

* test

* hp

* place config into data

* rofs

* try

* root

* ro

* revert to app

* test

* add gui option

* test rootless

* dont install

* more gui options

* root
---
 charts/stable/zigbee2mqtt/Chart.yaml     |  2 +-
 charts/stable/zigbee2mqtt/questions.yaml | 25 +++++++++++++++-----
 charts/stable/zigbee2mqtt/values.yaml    | 29 ++++++++++++------------
 3 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/charts/stable/zigbee2mqtt/Chart.yaml b/charts/stable/zigbee2mqtt/Chart.yaml
index 2b5e5db404b..0d5d9ff55dc 100644
--- a/charts/stable/zigbee2mqtt/Chart.yaml
+++ b/charts/stable/zigbee2mqtt/Chart.yaml
@@ -19,7 +19,7 @@ maintainers:
 name: zigbee2mqtt
 sources:
 - https://github.com/Koenkk/zigbee2mqtt
-version: 2.0.4
+version: 2.0.5
 annotations:
   truecharts.org/catagories: |
     - media
diff --git a/charts/stable/zigbee2mqtt/questions.yaml b/charts/stable/zigbee2mqtt/questions.yaml
index a0706e48639..6212af36e79 100644
--- a/charts/stable/zigbee2mqtt/questions.yaml
+++ b/charts/stable/zigbee2mqtt/questions.yaml
@@ -82,11 +82,24 @@ questions:
       additional_attrs: true
       type: dict
       attrs:
-        - variable: ZIGBEE2MQTT_DATA
-          label: "ZIGBEE2MQTT_DATA"
+        - variable: ZIGBEE2MQTT_CONFIG_SERIAL_PORT
+          label: "ZIGBEE2MQTT_CONFIG_SERIAL_PORT"
+          description: "This overrides config file"
           schema:
             type: string
-            default: "/data"
+            default: "/dev/ttyUSB0"
+        - variable: ZIGBEE2MQTT_CONFIG_MQTT_SERVER
+          label: "MQTT Server"
+          description: "This overrides config file"
+          schema:
+            type: string
+            default: "mqtt://mqtt.ix-mqtt.svc.cluster.local"
+        - variable: ZIGBEE2MQTT_CONFIG_MQTT_BASE_TOPIC
+          label: "MQTT Base Topic"
+          description: "This overrides config file"
+          schema:
+            type: string
+            default: "zigbee2mqtt"
 
 # Include{containerConfig}
 
@@ -283,7 +296,7 @@ questions:
                 label: "runAsNonRoot"
                 schema:
                   type: boolean
-                  default: true
+                  default: false
 # Include{securityContextAdvanced}
 
   - variable: podSecurityContext
@@ -298,13 +311,13 @@ questions:
           description: "The UserID of the user running the application"
           schema:
             type: int
-            default: 568
+            default: 0
         - variable: runAsGroup
           label: "runAsGroup"
           description: The groupID this App of the user running the application"
           schema:
             type: int
-            default: 568
+            default: 0
         - variable: fsGroup
           label: "fsGroup"
           description: "The group that should own ALL storage."
diff --git a/charts/stable/zigbee2mqtt/values.yaml b/charts/stable/zigbee2mqtt/values.yaml
index 6ef153ea740..96e2aff59fe 100644
--- a/charts/stable/zigbee2mqtt/values.yaml
+++ b/charts/stable/zigbee2mqtt/values.yaml
@@ -1,19 +1,21 @@
 image:
-  # -- image repository
   repository: tccr.io/truecharts/zigbee2mqtt
-  # -- image tag
   tag: v1.24.0@sha256:2574cbd6af36d0305c8034804e2c64f672757133d71b14f87f36913a9b97e754
-  # -- image pull policy
   pullPolicy: IfNotPresent
 
-# -- environment variables. See [image docs](https://www.zigbee2mqtt.io/information/configuration.html#override-via-environment-variables) for more details.
-# @default -- See below
 env:
-  # -- Set the data folder for Zigbee2MQTT.
-  ZIGBEE2MQTT_DATA: /data
+  ZIGBEE2MQTT_DATA: "/data"
+  ZIGBEE2MQTT_CONFIG_SERIAL_PORT: "/dev/ttyACM0"
+  ZIGBEE2MQTT_CONFIG_MQTT_SERVER: "mqtt://localhost"
+  ZIGBEE2MQTT_CONFIG_MQTT_BASE_TOPIC: "zigbee2mqtt"
+
+securityContext:
+  runAsNonRoot: false
+
+podSecurityContext:
+  runAsUser: 0
+  runAsGroup: 0
 
-# -- Configures service settings for the chart. Normally this does not need to be modified.
-# @default -- See values.yaml
 service:
   main:
     ports:
@@ -21,8 +23,6 @@ service:
         port: 10103
         targetPort: 8080
 
-# -- Configure persistence settings for the chart under this key.
-# @default -- See values.yaml
 persistence:
   data:
     enabled: true
@@ -47,9 +47,9 @@ config:
   # MQTT settings
   mqtt:
     # MQTT base topic for zigbee2mqtt MQTT messages
-    base_topic: zigbee2mqtt
+    base_topic: "{{ .Values.env.ZIGBEE2MQTT_CONFIG_MQTT_BASE_TOPIC }}"
     # MQTT server URL
-    server: "mqtt://localhost"
+    server: "{{ .Values.env.ZIGBEE2MQTT_CONFIG_MQTT_SERVER }}"
     # MQTT server authentication, uncomment if required:
     # user: my_user
     # password: my_password
@@ -63,8 +63,7 @@ config:
   # USB / Serial settings
   serial:
     # Location of your zigbee device
-    # port: /dev/serial/by-id/usb-dresden_elektronik_ingenieurtechnik_GmbH_ConBee_II_DE2400981-if00
-
+    port: "{{ .Values.env.ZIGBEE2MQTT_CONFIG_SERIAL_PORT }}"
     # Optional: adapter type, not needed unless you are experiencing problems (options: zstack, deconz)
     # adapter: deconz