diff --git a/charts/stable/zigbee2mqtt/Chart.yaml b/charts/stable/zigbee2mqtt/Chart.yaml index d39f8f21c89..d095bed81c2 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.6 +version: 2.0.7 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/zigbee2mqtt/questions.yaml b/charts/stable/zigbee2mqtt/questions.yaml index cc9c946113e..46f4eaccfa5 100644 --- a/charts/stable/zigbee2mqtt/questions.yaml +++ b/charts/stable/zigbee2mqtt/questions.yaml @@ -102,6 +102,24 @@ questions: additional_attrs: true type: dict attrs: + - variable: ZIGBEE2MQTT_CONFIG_PERMIT_JOIN + label: "ZIGBEE2MQTT_CONFIG_PERMIT_JOIN" + description: "This overrides config file" + schema: + type: boolean + default: true + - 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" - variable: ZIGBEE2MQTT_CONFIG_SERIAL_PORT label: "ZIGBEE2MQTT_CONFIG_SERIAL_PORT" description: "This overrides config file" @@ -115,26 +133,14 @@ questions: type: string default: "null" enum: - - value: "null" - description: "null" + - value: "auto" + description: "auto" - value: "deconz" description: "deconz" - value: "ezsp" description: "ezsp" - value: "zstack" description: "zstack" - - 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} diff --git a/charts/stable/zigbee2mqtt/templates/common.yaml b/charts/stable/zigbee2mqtt/templates/common.yaml index e13f800a2f0..da58e96d9e0 100644 --- a/charts/stable/zigbee2mqtt/templates/common.yaml +++ b/charts/stable/zigbee2mqtt/templates/common.yaml @@ -1,17 +1,5 @@ {{/* Make sure all variables are set properly */}} {{- include "common.setup" . }} -{{/* Append the configMap volume to the volumes */}} -{{- define "zigbee2mqtt.settingsVolume" -}} -enabled: "true" -mountPath: "/app/configuration.yaml" -subPath: "configuration.yaml" -type: "custom" -volumeSpec: - configMap: - name: {{ include "common.names.fullname" . }}-settings -{{- end -}} -{{- $_ := set .Values.persistence "zigbee2mqtt-settings" (include "zigbee2mqtt.settingsVolume" . | fromYaml) -}} - {{/* Render the templates */}} {{ include "common.postSetup" . }} diff --git a/charts/stable/zigbee2mqtt/templates/configmap.yaml b/charts/stable/zigbee2mqtt/templates/configmap.yaml deleted file mode 100644 index c007ac932e4..00000000000 --- a/charts/stable/zigbee2mqtt/templates/configmap.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "common.names.fullname" . }}-settings - labels: - {{- include "common.labels" . | nindent 4 }} -data: - configuration.yaml: | -{{- with .Values.config }} - {{- toYaml . | nindent 4 }} -{{- end }} diff --git a/charts/stable/zigbee2mqtt/values.yaml b/charts/stable/zigbee2mqtt/values.yaml index 3c6e5ecc12c..89402e701ab 100644 --- a/charts/stable/zigbee2mqtt/values.yaml +++ b/charts/stable/zigbee2mqtt/values.yaml @@ -4,15 +4,19 @@ image: pullPolicy: IfNotPresent secret: - ZIGBEE2MQTT_CONFIG_MQTT_USER: "admin" - ZIGBEE2MQTT_CONFIG_MQTT_PASSWORD: "password" + ZIGBEE2MQTT_CONFIG_MQTT_USER: "" + ZIGBEE2MQTT_CONFIG_MQTT_PASSWORD: "" env: ZIGBEE2MQTT_DATA: "/data" - ZIGBEE2MQTT_CONFIG_SERIAL_PORT: "/dev/ttyACM0" - ZIGBEE2MQTT_CONFIG_SERIAL_ADAPTER: "null" + ZIGBEE2MQTT_CONFIG_FRONTEND_PORT: "{{ .Values.service.main.ports.main.port }}" + ZIGBEE2MQTT_CONFIG_EXPIRIMENTAL_NEW_API: true + # User defined + ZIGBEE2MQTT_CONFIG_PERMIT_JOIN: true ZIGBEE2MQTT_CONFIG_MQTT_SERVER: "mqtt://localhost" ZIGBEE2MQTT_CONFIG_MQTT_BASE_TOPIC: "zigbee2mqtt" + ZIGBEE2MQTT_CONFIG_SERIAL_PORT: "/dev/ttyUSB0" + ZIGBEE2MQTT_CONFIG_SERIAL_ADAPTER: "auto" securityContext: runAsNonRoot: false @@ -26,83 +30,8 @@ service: ports: main: port: 10103 - targetPort: 8080 persistence: data: enabled: true mountPath: "/data" - -# -- zigbee2mqtt configuration settings. -# This will be copied into the container's persistent storage at first run only. -# Further configuration should be done in the application itself! -# See [project documentation](https://www.zigbee2mqtt.io/information/configuration.html) for more information. -# these are mostly just defaults and any further tweaking should be done using env-vars -# @default -- See values.yaml -config: - # These will be applied ONLY on first run - # Home Assistant integration (MQTT discovery) - homeassistant: false - - # allow new devices to join - # WARNING: Disable this after all devices have been paired! (default: false) - # Note: this will be controllable in the UI - permit_join: true - - # MQTT settings - mqtt: - # MQTT base topic for zigbee2mqtt MQTT messages - base_topic: "{{ .Values.env.ZIGBEE2MQTT_CONFIG_MQTT_BASE_TOPIC }}" - # MQTT server URL - server: "{{ .Values.env.ZIGBEE2MQTT_CONFIG_MQTT_SERVER }}" - # MQTT server authentication, uncomment if required: - user: "{{ .Values.env.ZIGBEE2MQTT_CONFIG_MQTT_USER }}" - # password: my_password - # client_id: my_id - # Alternatively, credentials may be put into a separate file, managed through a secret: - password: "{{ .Values.env.ZIGBEE2MQTT_CONFIG_MQTT_PASSWORD }}" - - # Optional: Include device information to mqtt messages (default: false) - include_device_information: true - - # USB / Serial settings - serial: - # Location of your zigbee device - port: "{{ .Values.env.ZIGBEE2MQTT_CONFIG_SERIAL_PORT }}" - # Optional: adapter type, not needed unless you are experiencing problems (options: zstack, deconz) - adapter: "{{ .Values.env.ZIGBEE2MQTT_CONFIG_SERIAL_ADAPTER }}" - - advanced: - network_key: GENERATE - log_output: - - console - log_level: info - - # Optional: ZigBee channel, changing requires re-pairing of all devices. (Note: use a ZLL channel: 11, 15, 20, or 25 to avoid Problems) - # default: 11 - # channel: 11 - - # Optional: Baudrate for serial port (default: 115200 for Z-Stack, 38400 for Deconz) - # baudrate: 38400 - - # Optional: RTS / CTS Hardware Flow Control for serial port (default: false) - # rtscts: true - - # Optional: Add a last_seen attribute to MQTT messages, contains date/time of last Zigbee message - # possible values are: disable (default), ISO_8601, ISO_8601_local, epoch (default: disable) - last_seen: 'ISO_8601' - - homeassistant_discovery_topic: 'homeassistant' - homeassistant_status_topic: 'homeassistant/status' - - # Optional: Enables report feature (see information -> report for more details) (default: false) - # report: true - - # Optional: Add an elapsed attribute to MQTT messages, contains milliseconds since the previous msg (default: false) - # elapsed: true - - # Both of these need to be enabled for the webui - frontend: - port: 8080 - experimental: - new_api: true diff --git a/docs/_static/img/appicons/self-service-passsword.png b/docs/_static/img/appicons/self-service-password.png similarity index 100% rename from docs/_static/img/appicons/self-service-passsword.png rename to docs/_static/img/appicons/self-service-password.png