From c511f4ad4c88ccfc6336a97431657ae9bba6b0ee Mon Sep 17 00:00:00 2001 From: SolidSly <15945533+SolidSly@users.noreply.github.com> Date: Fri, 26 Apr 2024 12:11:38 +0200 Subject: [PATCH] feat(dashy) Support for Dashy 3.0.0 (#21294) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** ⚒️ Fixes # This PR is supposed to fix this [issue](https://github.com/truecharts/charts/issues/21293). Support for Dashy v3.0.0 and its breaking changes. Tested locally on TrueNAS Scale Dragonfish using Helm commands. **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [ ] 🪛 Bugfix - [x] ⚠️ 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:** - [x] ⚖️ My code follows the style guidelines of this project - [x] 👀 I have performed a self-review of my own code - [x] #️⃣ I have commented my code, particularly in hard-to-understand areas - [ ] 📄 I have made corresponding changes to the documentation - [x] ⚠️ My changes generate no new warnings - [ ] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [x] ⬆️ I increased versions for any altered app according to semantic versioning - [x] I made sure the title starts with `feat(chart-name):`, `fix(chart-name):` or `chore(chart-name):` **➕ 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/dashy/Chart.yaml | 4 ++-- charts/stable/dashy/README.md | 7 +++++++ charts/stable/dashy/questions.yaml | 16 ++++++++-------- charts/stable/dashy/templates/common.yaml | 8 ++++---- charts/stable/dashy/values.yaml | 12 ++++++------ 5 files changed, 27 insertions(+), 20 deletions(-) diff --git a/charts/stable/dashy/Chart.yaml b/charts/stable/dashy/Chart.yaml index 639f7b74ab0..495dfab00e7 100644 --- a/charts/stable/dashy/Chart.yaml +++ b/charts/stable/dashy/Chart.yaml @@ -7,7 +7,7 @@ annotations: truecharts.org/min_helm_version: "3.11" truecharts.org/train: stable apiVersion: v2 -appVersion: 2.1.2 +appVersion: 3.0.0 dependencies: - name: common version: 20.3.11 @@ -33,4 +33,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/dashy - https://hub.docker.com/r/lissy93/dashy type: application -version: 6.8.13 +version: 7.0.0 diff --git a/charts/stable/dashy/README.md b/charts/stable/dashy/README.md index 872fcc1d07a..028d58aa23b 100644 --- a/charts/stable/dashy/README.md +++ b/charts/stable/dashy/README.md @@ -39,6 +39,13 @@ All our charts have dedicated documentation pages. The documentation for this chart can be found here: https://truecharts.org/charts/stable/dashy +## Upgrade to version 3.0.0 + +From version 3.0.0, Dashy introduced some breaking changes. Some of them will not impact users such as the change from port 80 to 8080. +However, from now on, the application expects a folder to be mounted instead of a file. + +More information about breaking changes can be found [here](https://github.com/Lissy93/dashy/releases/tag/3.0.0). + ## Support diff --git a/charts/stable/dashy/questions.yaml b/charts/stable/dashy/questions.yaml index b4711275ce6..8037910fb2a 100644 --- a/charts/stable/dashy/questions.yaml +++ b/charts/stable/dashy/questions.yaml @@ -19,22 +19,22 @@ questions: type: dict attrs: - variable: enabled - label: Enable Config File Mount - description: Mounts a config file from the given host path + label: Enable Config Folder Mount + description: Mounts a config folder from the given host path schema: type: boolean default: false show_subquestions_if: true subquestions: - - variable: configFileHostPath - label: Config File Host Path - description: Absolute host path of the config file + - variable: configDirectoryHostPath + label: Config Directory Host Path + description: Absolute host path of the config directory schema: type: string default: "" - - variable: configFileHostReadOnly - label: Config File Read Only - description: Mount config file as read Only + - variable: configDirectoryHostReadOnly + label: Config Directory Read Only + description: Mount config directory as read Only schema: type: boolean default: true diff --git a/charts/stable/dashy/templates/common.yaml b/charts/stable/dashy/templates/common.yaml index eaeaf9b0afc..50cbe19af00 100644 --- a/charts/stable/dashy/templates/common.yaml +++ b/charts/stable/dashy/templates/common.yaml @@ -16,10 +16,10 @@ items: {{- define "dashy.confighostpath" -}} enabled: true type: hostPath -readOnly: {{ .Values.dashy.configFileHostReadOnly }} -hostPathType: File -hostPath: {{ .Values.dashy.configFileHostPath }} -mountPath: /app/public/conf.yml +readOnly: {{ .Values.dashy.configDirectoryHostReadOnly }} +hostPathType: Directory +hostPath: {{ .Values.dashy.configDirectoryHostPath }} +mountPath: /app/user-data/ {{- end -}} {{- if .Values.dashyConfig -}} diff --git a/charts/stable/dashy/values.yaml b/charts/stable/dashy/values.yaml index a68d4a8774a..181e6c2df81 100644 --- a/charts/stable/dashy/values.yaml +++ b/charts/stable/dashy/values.yaml @@ -1,6 +1,6 @@ image: repository: lissy93/dashy - tag: 2.1.2@sha256:3826f7300f1b476815c5af9071fc7172f4233178e9b46dbc5a846fcc5748a3a1 + tag: 3.0.0@sha256:ee064a7a0ae7f480523df95cf87c7a3200911aa961b6c19237a13acf6347f981 pullPolicy: IfNotPresent securityContext: container: @@ -14,13 +14,13 @@ service: main: port: 10310 protocol: http - targetPort: 80 + targetPort: 8080 dashy: - # Enable config file mount from host path + # Enable config directory mount from host path enabled: false - configFileHostPath: "" - configFileHostReadOnly: true -# Leave empty if you plan to use config file from host path + configDirectoryHostPath: "" + configDirectoryHostReadOnly: true +# Leave empty if you plan to use config directory from host path dashyConfig: {} # pageInfo: # title: Home Lab