diff --git a/stable/zigbee2mqtt/2.0.6/ix_values.yaml b/stable/zigbee2mqtt/2.0.6/ix_values.yaml deleted file mode 100644 index 3c6e5ecc12c..00000000000 --- a/stable/zigbee2mqtt/2.0.6/ix_values.yaml +++ /dev/null @@ -1,108 +0,0 @@ -image: - repository: tccr.io/truecharts/zigbee2mqtt - tag: v1.24.0@sha256:2574cbd6af36d0305c8034804e2c64f672757133d71b14f87f36913a9b97e754 - pullPolicy: IfNotPresent - -secret: - ZIGBEE2MQTT_CONFIG_MQTT_USER: "admin" - ZIGBEE2MQTT_CONFIG_MQTT_PASSWORD: "password" - -env: - ZIGBEE2MQTT_DATA: "/data" - ZIGBEE2MQTT_CONFIG_SERIAL_PORT: "/dev/ttyACM0" - ZIGBEE2MQTT_CONFIG_SERIAL_ADAPTER: "null" - ZIGBEE2MQTT_CONFIG_MQTT_SERVER: "mqtt://localhost" - ZIGBEE2MQTT_CONFIG_MQTT_BASE_TOPIC: "zigbee2mqtt" - -securityContext: - runAsNonRoot: false - -podSecurityContext: - runAsUser: 0 - runAsGroup: 0 - -service: - main: - 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/stable/zigbee2mqtt/2.0.6/templates/common.yaml b/stable/zigbee2mqtt/2.0.6/templates/common.yaml deleted file mode 100644 index e13f800a2f0..00000000000 --- a/stable/zigbee2mqtt/2.0.6/templates/common.yaml +++ /dev/null @@ -1,17 +0,0 @@ -{{/* 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/stable/zigbee2mqtt/2.0.6/templates/configmap.yaml b/stable/zigbee2mqtt/2.0.6/templates/configmap.yaml deleted file mode 100644 index c007ac932e4..00000000000 --- a/stable/zigbee2mqtt/2.0.6/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/stable/zigbee2mqtt/2.0.6/CHANGELOG.md b/stable/zigbee2mqtt/2.0.7/CHANGELOG.md similarity index 90% rename from stable/zigbee2mqtt/2.0.6/CHANGELOG.md rename to stable/zigbee2mqtt/2.0.7/CHANGELOG.md index 8153af9af0c..9bc4917e42c 100644 --- a/stable/zigbee2mqtt/2.0.6/CHANGELOG.md +++ b/stable/zigbee2mqtt/2.0.7/CHANGELOG.md @@ -1,6 +1,15 @@ # Changelog
+ +### [zigbee2mqtt-2.0.7](https://github.com/truecharts/apps/compare/zigbee2mqtt-2.0.6...zigbee2mqtt-2.0.7) (2022-03-20) + +#### Fix + +* Remove configmap and provide questions for basic setup to get up and running ([#2225](https://github.com/truecharts/apps/issues/2225)) + + + ### [zigbee2mqtt-2.0.6](https://github.com/truecharts/apps/compare/zigbee2mqtt-2.0.5...zigbee2mqtt-2.0.6) (2022-03-19) @@ -88,12 +97,3 @@ * update helm general non-major helm releases ([#1871](https://github.com/truecharts/apps/issues/1871)) - - -### [zigbee2mqtt-1.0.41](https://github.com/truecharts/apps/compare/zigbee2mqtt-1.0.40...zigbee2mqtt-1.0.41) (2022-02-06) - -#### Chore - -* update helm chart common to v8.15.0 ([#1859](https://github.com/truecharts/apps/issues/1859)) - - diff --git a/stable/zigbee2mqtt/2.0.6/CONFIG.md b/stable/zigbee2mqtt/2.0.7/CONFIG.md similarity index 100% rename from stable/zigbee2mqtt/2.0.6/CONFIG.md rename to stable/zigbee2mqtt/2.0.7/CONFIG.md diff --git a/stable/zigbee2mqtt/2.0.6/Chart.lock b/stable/zigbee2mqtt/2.0.7/Chart.lock similarity index 78% rename from stable/zigbee2mqtt/2.0.6/Chart.lock rename to stable/zigbee2mqtt/2.0.7/Chart.lock index d2ed988b083..08f6f0d38f1 100644 --- a/stable/zigbee2mqtt/2.0.6/Chart.lock +++ b/stable/zigbee2mqtt/2.0.7/Chart.lock @@ -3,4 +3,4 @@ dependencies: repository: https://truecharts.org version: 9.1.6 digest: sha256:d65395039794859a54173a3b1687c20877eeb9127fa4044016eb188cc1644675 -generated: "2022-03-19T10:11:47.546426136Z" +generated: "2022-03-20T12:04:50.077032082Z" diff --git a/stable/zigbee2mqtt/2.0.6/Chart.yaml b/stable/zigbee2mqtt/2.0.7/Chart.yaml similarity index 97% rename from stable/zigbee2mqtt/2.0.6/Chart.yaml rename to stable/zigbee2mqtt/2.0.7/Chart.yaml index d39f8f21c89..d095bed81c2 100644 --- a/stable/zigbee2mqtt/2.0.6/Chart.yaml +++ b/stable/zigbee2mqtt/2.0.7/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/stable/zigbee2mqtt/2.0.6/README.md b/stable/zigbee2mqtt/2.0.7/README.md similarity index 100% rename from stable/zigbee2mqtt/2.0.6/README.md rename to stable/zigbee2mqtt/2.0.7/README.md diff --git a/stable/zigbee2mqtt/2.0.6/SKIPINSTALL b/stable/zigbee2mqtt/2.0.7/SKIPINSTALL similarity index 100% rename from stable/zigbee2mqtt/2.0.6/SKIPINSTALL rename to stable/zigbee2mqtt/2.0.7/SKIPINSTALL diff --git a/stable/zigbee2mqtt/2.0.6/app-readme.md b/stable/zigbee2mqtt/2.0.7/app-readme.md similarity index 100% rename from stable/zigbee2mqtt/2.0.6/app-readme.md rename to stable/zigbee2mqtt/2.0.7/app-readme.md diff --git a/stable/zigbee2mqtt/2.0.6/charts/common-9.1.6.tgz b/stable/zigbee2mqtt/2.0.7/charts/common-9.1.6.tgz similarity index 100% rename from stable/zigbee2mqtt/2.0.6/charts/common-9.1.6.tgz rename to stable/zigbee2mqtt/2.0.7/charts/common-9.1.6.tgz diff --git a/stable/zigbee2mqtt/2.0.6/helm-values.md b/stable/zigbee2mqtt/2.0.7/helm-values.md similarity index 66% rename from stable/zigbee2mqtt/2.0.6/helm-values.md rename to stable/zigbee2mqtt/2.0.7/helm-values.md index fc9a12322ac..1b3d6b8a4d6 100644 --- a/stable/zigbee2mqtt/2.0.6/helm-values.md +++ b/stable/zigbee2mqtt/2.0.7/helm-values.md @@ -11,11 +11,13 @@ You will, however, be able to use all values referenced in the common chart here | Key | Type | Default | Description | |-----|------|---------|-------------| -| config | object | See values.yaml | 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 | +| env.ZIGBEE2MQTT_CONFIG_EXPIRIMENTAL_NEW_API | bool | `true` | | +| env.ZIGBEE2MQTT_CONFIG_FRONTEND_PORT | string | `"{{ .Values.service.main.ports.main.port }}"` | | | env.ZIGBEE2MQTT_CONFIG_MQTT_BASE_TOPIC | string | `"zigbee2mqtt"` | | | env.ZIGBEE2MQTT_CONFIG_MQTT_SERVER | string | `"mqtt://localhost"` | | -| env.ZIGBEE2MQTT_CONFIG_SERIAL_ADAPTER | string | `"null"` | | -| env.ZIGBEE2MQTT_CONFIG_SERIAL_PORT | string | `"/dev/ttyACM0"` | | +| env.ZIGBEE2MQTT_CONFIG_PERMIT_JOIN | bool | `true` | | +| env.ZIGBEE2MQTT_CONFIG_SERIAL_ADAPTER | string | `"auto"` | | +| env.ZIGBEE2MQTT_CONFIG_SERIAL_PORT | string | `"/dev/ttyUSB0"` | | | env.ZIGBEE2MQTT_DATA | string | `"/data"` | | | image.pullPolicy | string | `"IfNotPresent"` | | | image.repository | string | `"tccr.io/truecharts/zigbee2mqtt"` | | @@ -24,10 +26,9 @@ You will, however, be able to use all values referenced in the common chart here | persistence.data.mountPath | string | `"/data"` | | | podSecurityContext.runAsGroup | int | `0` | | | podSecurityContext.runAsUser | int | `0` | | -| secret.ZIGBEE2MQTT_CONFIG_MQTT_PASSWORD | string | `"password"` | | -| secret.ZIGBEE2MQTT_CONFIG_MQTT_USER | string | `"admin"` | | +| secret.ZIGBEE2MQTT_CONFIG_MQTT_PASSWORD | string | `""` | | +| secret.ZIGBEE2MQTT_CONFIG_MQTT_USER | string | `""` | | | securityContext.runAsNonRoot | bool | `false` | | | service.main.ports.main.port | int | `10103` | | -| service.main.ports.main.targetPort | int | `8080` | | All Rights Reserved - The TrueCharts Project diff --git a/stable/zigbee2mqtt/2.0.7/ix_values.yaml b/stable/zigbee2mqtt/2.0.7/ix_values.yaml new file mode 100644 index 00000000000..89402e701ab --- /dev/null +++ b/stable/zigbee2mqtt/2.0.7/ix_values.yaml @@ -0,0 +1,37 @@ +image: + repository: tccr.io/truecharts/zigbee2mqtt + tag: v1.24.0@sha256:2574cbd6af36d0305c8034804e2c64f672757133d71b14f87f36913a9b97e754 + pullPolicy: IfNotPresent + +secret: + ZIGBEE2MQTT_CONFIG_MQTT_USER: "" + ZIGBEE2MQTT_CONFIG_MQTT_PASSWORD: "" + +env: + ZIGBEE2MQTT_DATA: "/data" + 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 + +podSecurityContext: + runAsUser: 0 + runAsGroup: 0 + +service: + main: + ports: + main: + port: 10103 + +persistence: + data: + enabled: true + mountPath: "/data" diff --git a/stable/zigbee2mqtt/2.0.6/questions.yaml b/stable/zigbee2mqtt/2.0.7/questions.yaml similarity index 99% rename from stable/zigbee2mqtt/2.0.6/questions.yaml rename to stable/zigbee2mqtt/2.0.7/questions.yaml index 1701395ff7f..05265456a96 100644 --- a/stable/zigbee2mqtt/2.0.6/questions.yaml +++ b/stable/zigbee2mqtt/2.0.7/questions.yaml @@ -196,6 +196,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" @@ -209,26 +227,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" - variable: TZ label: "Timezone" diff --git a/stable/zigbee2mqtt/2.0.6/security.md b/stable/zigbee2mqtt/2.0.7/security.md similarity index 100% rename from stable/zigbee2mqtt/2.0.6/security.md rename to stable/zigbee2mqtt/2.0.7/security.md diff --git a/stable/zigbee2mqtt/2.0.7/templates/common.yaml b/stable/zigbee2mqtt/2.0.7/templates/common.yaml new file mode 100644 index 00000000000..da58e96d9e0 --- /dev/null +++ b/stable/zigbee2mqtt/2.0.7/templates/common.yaml @@ -0,0 +1,5 @@ +{{/* Make sure all variables are set properly */}} +{{- include "common.setup" . }} + +{{/* Render the templates */}} +{{ include "common.postSetup" . }} diff --git a/stable/zigbee2mqtt/2.0.6/values.yaml b/stable/zigbee2mqtt/2.0.7/values.yaml similarity index 100% rename from stable/zigbee2mqtt/2.0.6/values.yaml rename to stable/zigbee2mqtt/2.0.7/values.yaml