From 5129b427465c9e5f79280f664465c448fb5f5b60 Mon Sep 17 00:00:00 2001 From: gismo2004 Date: Thu, 1 Jun 2023 22:28:40 +0200 Subject: [PATCH] feat(tasmoadmin): Port to new common (#9284) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** ⚒️ Fixes # **⚙️ Type of change** - [x] ⚙️ 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:** - [x] ⚖️ 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 - [x] ⬆️ 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> Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> --- charts/incubator/tasmoadmin/Chart.yaml | 5 +- charts/incubator/tasmoadmin/questions.yaml | 65 +++++++++---------- .../tasmoadmin/templates/common.yaml | 3 +- charts/incubator/tasmoadmin/values.yaml | 27 ++++---- 4 files changed, 49 insertions(+), 51 deletions(-) diff --git a/charts/incubator/tasmoadmin/Chart.yaml b/charts/incubator/tasmoadmin/Chart.yaml index 2dcf50bbe6b..b789c620299 100644 --- a/charts/incubator/tasmoadmin/Chart.yaml +++ b/charts/incubator/tasmoadmin/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.4.2" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 11.1.2 + version: 12.10.4 deprecated: false description: A administrative platform for devices flashed with Tasmota. home: https://truecharts.org/charts/incubator/tasmoadmin @@ -22,10 +22,9 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/incubator/tasmoadmin - https://github.com/TasmoAdmin/TasmoAdmin type: application -version: 3.0.0 +version: 4.0.0 annotations: truecharts.org/catagories: | - HomeAutomation - Network-Management truecharts.org/SCALE-support: "true" - truecharts.org/grade: U diff --git a/charts/incubator/tasmoadmin/questions.yaml b/charts/incubator/tasmoadmin/questions.yaml index 600d9f51948..a6802d991c5 100644 --- a/charts/incubator/tasmoadmin/questions.yaml +++ b/charts/incubator/tasmoadmin/questions.yaml @@ -14,14 +14,14 @@ questions: # Include{containerAdvanced} - variable: env - group: App Configuration - label: Image Environment + group: "App Configuration" + label: "Image Environment" schema: additional_attrs: true type: dict attrs: - variable: TASMO_DEBUG - label: Tasmo Debug + label: "Tasmo Debug" schema: type: string required: true @@ -32,25 +32,20 @@ questions: - value: "1" description: "True" # Include{containerConfig} +# Include{podOptions} # Include{serviceRoot} - - variable: main - label: Main Service - description: The Primary service on which the healthcheck runs, often the webUI - schema: - additional_attrs: true - type: dict - attrs: +# Include{serviceMain} # Include{serviceSelectorLoadBalancer} # Include{serviceSelectorExtras} - variable: main - label: Main Service Port Configuration + label: "Main Service Port Configuration" schema: additional_attrs: true type: dict attrs: - variable: port - label: Port - description: This port exposes the container port on the service + label: "Port" + description: "This port exposes the container port on the service" schema: type: int default: 9541 @@ -60,8 +55,8 @@ questions: # Include{serviceList} # Include{persistenceRoot} - variable: data - label: App Data Storage - description: Stores the Application Data. + label: "App Data Storage" + description: "Stores the Application Data." schema: additional_attrs: true type: dict @@ -70,7 +65,7 @@ questions: # Include{persistenceList} # Include{ingressRoot} - variable: main - label: Main Ingress + label: "Main Ingress" schema: additional_attrs: true type: dict @@ -80,29 +75,29 @@ questions: # Include{ingressTraefik} # Include{ingressAdvanced} # Include{ingressList} +# Include{securityContextRoot} -# Include{podSecurityContextRoot} - - variable: runAsUser - label: runAsUser - description: The UserID of the user running the application - schema: - type: int - default: 0 - - variable: runAsGroup - label: runAsGroup - description: The groupID this App of the user running the application - schema: - type: int - default: 0 + - variable: runAsUser + label: "runAsUser" + description: "The UserID of the user running the application" + schema: + type: int + default: 0 + - variable: runAsGroup + label: "runAsGroup" + description: "The groupID of the user running the application" + schema: + type: int + default: 0 # Include{securityContextContainer} # Include{securityContextAdvanced} # Include{securityContextPod} - - variable: fsGroup - label: fsGroup - description: The group that should own ALL storage. - schema: - type: int - default: 568 + - variable: fsGroup + label: "fsGroup" + description: "The group that should own ALL storage." + schema: + type: int + default: 568 # Include{resources} # Include{advanced} diff --git a/charts/incubator/tasmoadmin/templates/common.yaml b/charts/incubator/tasmoadmin/templates/common.yaml index cbf66c20818..b51394e00a4 100644 --- a/charts/incubator/tasmoadmin/templates/common.yaml +++ b/charts/incubator/tasmoadmin/templates/common.yaml @@ -1,2 +1 @@ -{{/* Render the templates */}} -{{ include "tc.common.loader.all" . }} +{{ include "tc.v1.common.loader.all" . }} diff --git a/charts/incubator/tasmoadmin/values.yaml b/charts/incubator/tasmoadmin/values.yaml index 5c8d6f2a47c..19282c3d5dd 100644 --- a/charts/incubator/tasmoadmin/values.yaml +++ b/charts/incubator/tasmoadmin/values.yaml @@ -3,24 +3,28 @@ image: repository: tccr.io/truecharts/tasmoadmin tag: 2.4.2@sha256:5144a471e58004c129a0d800977e1e31ba4b46c52e37b9258591086161d2d96f -podSecurityContext: - runAsGroup: 0 - runAsUser: 0 - securityContext: - readOnlyRootFilesystem: false - runAsNonRoot: false + container: + readOnlyRootFilesystem: false + runAsNonRoot: false + runAsUser: 0 + runAsGroup: 0 -env: - TASMO_DATADIR: /data - TASMO_DEBUG: 1 +workload: + main: + podSpec: + containers: + main: + env: + TASMO_DATADIR: /data + TASMO_DEBUG: 1 service: main: ports: main: port: 9541 - protocol: HTTP + protocol: http targetPort: 80 persistence: @@ -29,4 +33,5 @@ persistence: mountPath: /data portal: - enabled: true + open: + enabled: true