From 3c11b4f85de6fd5ea9b4b9f92fa3e487edbcb55c Mon Sep 17 00:00:00 2001
From: StevenMcElligott <89483932+StevenMcElligott@users.noreply.github.com>
Date: Sun, 28 Jan 2024 17:44:15 -0500
Subject: [PATCH] feat(zigbee2mqtt): Remove old options (#17564)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**Description**

I'm not a heavy user but removing the old API seems sensible (especially
if it wasn't necessary 3 years ago) and changing the defaults to not
true to automatic join is also a good idea

⚒️ Fixes  #17562 and #17561

**⚙️ Type of change**

- [ ] ⚙️ Feature/App addition
- [X] 🪛 Bugfix
- [ ] ⚠️ Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [ ] 🔃 Refactor of current code

**🧪 How Has This Been Tested?**
<!--
Please describe the tests that you ran to verify your changes. Provide
instructions so we can reproduce. Please also list any relevant details
for your test configuration
-->

**📃 Notes:**
<!-- Please enter any other relevant information here -->

**✔️ Checklist:**

- [ ] ⚖️ My code follows the style guidelines of this project
- [ ] 👀 I have performed a self-review of my own code
- [ ] #️⃣ I have commented my code, particularly in hard-to-understand
areas
- [ ] 📄 I have made corresponding changes to the documentation
- [ ] ⚠️ My changes generate no new warnings
- [ ] 🧪 I have added tests to this description that prove my fix is
effective or that my feature works
- [ ] ⬆️ I increased versions for any altered app according to semantic
versioning

**➕ App addition**

If this PR is an app addition please make sure you have done the
following.

- [ ] 🖼️ I have added an icon in the Chart's root directory called
`icon.png`

---

_Please don't blindly check all the boxes. Read them and only check
those that apply.
Those checkboxes are there for the reviewer to see what is this all
about and
the status of this PR with a quick glance._
---
 charts/stable/zigbee2mqtt/Chart.yaml     | 2 +-
 charts/stable/zigbee2mqtt/questions.yaml | 8 +-------
 charts/stable/zigbee2mqtt/values.yaml    | 6 +-----
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/charts/stable/zigbee2mqtt/Chart.yaml b/charts/stable/zigbee2mqtt/Chart.yaml
index 266589f0f15..7ae9796232b 100644
--- a/charts/stable/zigbee2mqtt/Chart.yaml
+++ b/charts/stable/zigbee2mqtt/Chart.yaml
@@ -35,4 +35,4 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/zigbee2mqtt
   - https://hub.docker.com/r/koenkk/zigbee2mqtt
 type: application
-version: 10.3.7
+version: 10.4.0
diff --git a/charts/stable/zigbee2mqtt/questions.yaml b/charts/stable/zigbee2mqtt/questions.yaml
index 2bf907f32f4..d2a3e38fcc7 100644
--- a/charts/stable/zigbee2mqtt/questions.yaml
+++ b/charts/stable/zigbee2mqtt/questions.yaml
@@ -42,13 +42,7 @@ questions:
                                               description: "This will override the specific value of config file"
                                               schema:
                                                 type: boolean
-                                                default: true
-                                            - variable: ZIGBEE2MQTT_CONFIG_EXPIRIMENTAL_NEW_API
-                                              label: "ZIGBEE2MQTT_CONFIG_EXPIRIMENTAL_NEW_API"
-                                              description: "This will override the specific value of config file"
-                                              schema:
-                                                type: boolean
-                                                default: true
+                                                default: false
                                             - variable: ZIGBEE2MQTT_CONFIG_MQTT_SERVER
                                               label: "MQTT Server"
                                               description: "This will override the specific value of config file"
diff --git a/charts/stable/zigbee2mqtt/values.yaml b/charts/stable/zigbee2mqtt/values.yaml
index 6baf4cf05fe..dc9da851f43 100644
--- a/charts/stable/zigbee2mqtt/values.yaml
+++ b/charts/stable/zigbee2mqtt/values.yaml
@@ -31,7 +31,6 @@ workload:
           type: init
           env:
             ZIGBEE2MQTT_CONFIG_FRONTEND_PORT: "{{ .Values.service.main.ports.main.port }}"
-            ZIGBEE2MQTT_CONFIG_EXPIRIMENTAL_NEW_API: "{{ .Values.workload.main.podSpec.containers.main.env.ZIGBEE2MQTT_CONFIG_EXPIRIMENTAL_NEW_API }}"
             ZIGBEE2MQTT_CONFIG_PERMIT_JOIN: "{{ .Values.workload.main.podSpec.containers.main.env.ZIGBEE2MQTT_CONFIG_PERMIT_JOIN }}"
             ZIGBEE2MQTT_CONFIG_MQTT_SERVER: "{{ .Values.workload.main.podSpec.containers.main.env.ZIGBEE2MQTT_CONFIG_MQTT_SERVER }}"
             ZIGBEE2MQTT_CONFIG_MQTT_USER: "{{ .Values.secret.ZIGBEE2MQTT_CONFIG_MQTT_USER }}"
@@ -55,8 +54,6 @@ workload:
                 echo "# You however will not see this values change in the file." >> /data/configuration.yaml;
                 echo "# It's a generated file based on the values provided on initial install." >> /data/configuration.yaml;
                 echo "##########################################################" >> /data/configuration.yaml;
-                echo "experimental:" >> /data/configuration.yaml;
-                echo "  new_api: $ZIGBEE2MQTT_CONFIG_EXPIRIMENTAL_NEW_API" >> /data/configuration.yaml;
                 echo "frontend:" >> /data/configuration.yaml;
                 echo "  port: $ZIGBEE2MQTT_CONFIG_FRONTEND_PORT" >> /data/configuration.yaml;
                 echo "permit_join: $ZIGBEE2MQTT_CONFIG_PERMIT_JOIN" >> /data/configuration.yaml;
@@ -86,8 +83,7 @@ workload:
             # User defined
             USE_CUSTOM_CONFIG_FILE: false
             # This values are required for the autogenerated file to work.
-            # ZIGBEE2MQTT_CONFIG_EXPIRIMENTAL_NEW_API: true
-            # ZIGBEE2MQTT_CONFIG_PERMIT_JOIN: true
+            # ZIGBEE2MQTT_CONFIG_PERMIT_JOIN: false
             # ZIGBEE2MQTT_CONFIG_MQTT_SERVER: "mqtt://localhost"
             # ZIGBEE2MQTT_CONFIG_MQTT_BASE_TOPIC: "zigbee2mqtt"
             # ZIGBEE2MQTT_CONFIG_SERIAL_PORT: "/dev/ttyUSB0"