From 14ea546f09b00c2a963113eee292f6aadd8bd974 Mon Sep 17 00:00:00 2001 From: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Date: Sat, 6 May 2023 14:09:00 +0300 Subject: [PATCH] fix(deconz): Breaking change port to new common (#8790) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** ⚒️ Fixes #8752 **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [ ] 🪛 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?** **📃 Notes:** **✔️ 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 opened a PR on [truecharts/containers](https://github.com/truecharts/containers) adding the container to TrueCharts mirror repo. - [ ] 🖼️ 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._ --------- Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> --- charts/stable/deconz/Chart.yaml | 4 +- charts/stable/deconz/ci/test-values.yaml | 9 ++- charts/stable/deconz/templates/common.yaml | 2 +- charts/stable/deconz/values.yaml | 65 ++++++++++------------ 4 files changed, 40 insertions(+), 40 deletions(-) diff --git a/charts/stable/deconz/Chart.yaml b/charts/stable/deconz/Chart.yaml index 35e2daea026..a0bcd6b1a84 100644 --- a/charts/stable/deconz/Chart.yaml +++ b/charts/stable/deconz/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.22.00" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 11.1.2 + version: 12.6.6 description: deCONZ is an easy to use control software, with which you can set up and control Zigbee networks of any size without further programming effort. home: https://truecharts.org/charts/stable/deconz icon: https://truecharts.org/img/hotlink-ok/chart-icons/deconz.png @@ -22,7 +22,7 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/deconz - https://github.com/dresden-elektronik/deconz-rest-plugin - https://github.com/marthoc/docker-deconz -version: 10.0.16 +version: 11.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/deconz/ci/test-values.yaml b/charts/stable/deconz/ci/test-values.yaml index 3b1a95de02c..8be1361d3b8 100644 --- a/charts/stable/deconz/ci/test-values.yaml +++ b/charts/stable/deconz/ci/test-values.yaml @@ -1,2 +1,7 @@ -env: - DECONZ_DEVICE: 0 +workload: + main: + podSpec: + containers: + main: + env: + DECONZ_DEVICE: 0 diff --git a/charts/stable/deconz/templates/common.yaml b/charts/stable/deconz/templates/common.yaml index c1a366e1cf0..b51394e00a4 100644 --- a/charts/stable/deconz/templates/common.yaml +++ b/charts/stable/deconz/templates/common.yaml @@ -1 +1 @@ -{{ include "tc.common.loader.all" . }} +{{ include "tc.v1.common.loader.all" . }} diff --git a/charts/stable/deconz/values.yaml b/charts/stable/deconz/values.yaml index 4b9c9ff854e..9f83f37a0f0 100644 --- a/charts/stable/deconz/values.yaml +++ b/charts/stable/deconz/values.yaml @@ -4,29 +4,35 @@ image: pullPolicy: IfNotPresent securityContext: - readOnlyRootFilesystem: false - runAsNonRoot: false + container: + readOnlyRootFilesystem: false + runAsNonRoot: false + runAsUser: 0 + runAsGroup: 0 -podSecurityContext: - runAsUser: 0 - runAsGroup: 0 - -secretEnv: - DECONZ_VNC_PASSWORD: "" - -env: - # -- Override the location where deCONZ looks for the RaspBee/Conbee device. - # Example: /dev/ttyUSB0 - DECONZ_DEVICE: "" - DECONZ_UPNP: 0 - DECONZ_START_VERBOSE: 0 - # -- Enable VNC access to the container to view the deCONZ ZigBee mesh - DECONZ_VNC_MODE: 1 - 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: "{{ .Values.security.PUID }}" - DECONZ_GID: "{{ .Values.podSecurityContext.fsGroup }}" +workload: + main: + podSpec: + containers: + main: + securityContext: + capabilities: + add: + - NET_BIND_SERVICE + env: + 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: "{{ .Values.securityContext.container.PUID }}" + DECONZ_GID: "{{ .Values.securityContext.pod.fsGroup }}" + # -- Override the location where deCONZ looks for the RaspBee/Conbee device. + # Example: /dev/ttyUSB0 + DECONZ_DEVICE: "" + DECONZ_UPNP: 0 + DECONZ_START_VERBOSE: 0 + # -- Enable VNC access to the container to view the deCONZ ZigBee mesh + DECONZ_VNC_MODE: 1 + DECONZ_VNC_PASSWORD: "" service: main: @@ -51,17 +57,6 @@ persistence: enabled: true mountPath: "/opt/deCONZ" -# -- Affinity constraint rules to place the Pod on a specific node. -# [[ref]](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) -affinity: {} -# nodeAffinity: -# requiredDuringSchedulingIgnoredDuringExecution: -# nodeSelectorTerms: -# - matchExpressions: -# - key: app -# operator: In -# values: -# - zigbee-controller - portal: - enabled: true + open: + enabled: true