From 33a49aadbb974c35568940da82a446405d51f9db Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Thu, 24 Feb 2022 02:01:47 +0200
Subject: [PATCH] fix(deconz): Dynamicly set env vars for ports based on
 service (#1948)

---
 charts/stable/deconz/Chart.yaml     |  2 +-
 charts/stable/deconz/questions.yaml | 24 +++---------------------
 charts/stable/deconz/values.yaml    | 12 +++---------
 3 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/charts/stable/deconz/Chart.yaml b/charts/stable/deconz/Chart.yaml
index f354f3d9e76..d0d62d8f733 100644
--- a/charts/stable/deconz/Chart.yaml
+++ b/charts/stable/deconz/Chart.yaml
@@ -22,7 +22,7 @@ name: deconz
 sources:
 - https://github.com/dresden-elektronik/deconz-rest-plugin
 - https://github.com/marthoc/docker-deconz
-version: 6.0.22
+version: 6.0.23
 annotations:
   truecharts.org/catagories: |
     - media
diff --git a/charts/stable/deconz/questions.yaml b/charts/stable/deconz/questions.yaml
index 9b3b77faac1..2b9e5f7f10a 100644
--- a/charts/stable/deconz/questions.yaml
+++ b/charts/stable/deconz/questions.yaml
@@ -109,24 +109,6 @@ questions:
           schema:
             type: int
             default: 1
-        - variable: DECONZ_WEB_PORT
-          label: "DECONZ_WEB_PORT"
-          description: "Web UI listen port"
-          schema:
-            type: int
-            default: 80
-        - variable: DECONZ_WS_PORT
-          label: "DECONZ_WS_PORT"
-          description: "Websocket listen port"
-          schema:
-            type: int
-            default: 443
-        - variable: DECONZ_VNC_PORT
-          label: "DECONZ_VNC_PORT"
-          description: " VNC server listen port"
-          schema:
-            type: int
-            default: 5900
 
 # Include{containerConfig}
 
@@ -191,7 +173,7 @@ questions:
                                   description: "The internal(!) port on the container the Application runs on"
                                   schema:
                                     type: int
-                                    default: 80
+                                    default: 10008
 
 
         - variable: websocket
@@ -248,7 +230,7 @@ questions:
                                   description: "The internal(!) port on the container the Application runs on"
                                   schema:
                                     type: int
-                                    default: 443
+                                    default: 10001
 
 
         - variable: vnc
@@ -305,7 +287,7 @@ questions:
                                   description: "The internal(!) port on the container the Application runs on"
                                   schema:
                                     type: int
-                                    default: 5900
+                                    default: 10002
 
   - variable: serviceexpert
     group: "Networking and Services"
diff --git a/charts/stable/deconz/values.yaml b/charts/stable/deconz/values.yaml
index 3190bb7c451..e65e6740158 100644
--- a/charts/stable/deconz/values.yaml
+++ b/charts/stable/deconz/values.yaml
@@ -26,12 +26,9 @@ env:
   DECONZ_DEVICE:  # /dev/ttyUSB0
   # -- Enable VNC access to the container to view the deCONZ ZigBee mesh
   DECONZ_VNC_MODE: 1
-  # -- Web UI listen port
-  DECONZ_WEB_PORT: 8080
-  # -- Websocket listen port
-  DECONZ_WS_PORT: 6080
-  # -- VNC server listen port
-  DECONZ_VNC_PORT: 5900
+  DECONZ_WEB_PORT: "{{ .Values.service.main.ports.main.port }}"
+  DECONZ_WS_PORT: "{{ .Values.service.websocket.ports.websocket.port }}"
+  DECONZ_VNC_PORT: "{{ .Values.service.vnc.ports.vnc.port }}"
   DECONZ_UID: 568
   DECONZ_GID: 568
 
@@ -42,21 +39,18 @@ service:
     ports:
       main:
         port: 10008
-        targetPort: 8080
   websocket:
     enabled: true
     ports:
       websocket:
         enabled: true
         port: 10001
-        targetPort: 6080
   vnc:
     enabled: true
     ports:
       vnc:
         enabled: true
         port: 10002
-        targetPort: 5900
 
 # -- Configure persistence settings for the chart under this key.
 # @default -- See values.yaml