From f093f1771dc0200a5722d82d135755fc210f40c6 Mon Sep 17 00:00:00 2001 From: gismo2004 Date: Fri, 7 Jul 2023 14:16:35 +0200 Subject: [PATCH] migrate(tasmobackup) migrate to new common (#10243) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** migrate to new common ⚒️ Fixes # **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [ ] 🪛 Bugfix - [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [x] 🔃 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 - [ ] #️⃣ 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: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com> Co-authored-by: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com> --- charts/incubator/tasmobackup/Chart.yaml | 17 +++++----- charts/incubator/tasmobackup/questions.yaml | 15 ++++---- .../tasmobackup/templates/common.yaml | 3 +- charts/incubator/tasmobackup/values.yaml | 34 +++++++++++++------ 4 files changed, 39 insertions(+), 30 deletions(-) diff --git a/charts/incubator/tasmobackup/Chart.yaml b/charts/incubator/tasmobackup/Chart.yaml index 34f05e97fb2..5d2c2c739e6 100644 --- a/charts/incubator/tasmobackup/Chart.yaml +++ b/charts/incubator/tasmobackup/Chart.yaml @@ -1,16 +1,11 @@ -annotations: - truecharts.org/SCALE-support: "true" - truecharts.org/catagories: | - - HomeAutomation - - Network-Management apiVersion: v2 appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 11.1.2 + version: 12.14.6 deprecated: false -description: Tasmota backup - TasmoBackup - Backup all your tasmota devices in one place. Add/scan for your Tasmota devices. Use the backupall.php page to schedule automated backups of all devices! +description: backup all your tasmota devices in one place. home: https://truecharts.org/charts/incubator/tasmobackup icon: https://truecharts.org/img/hotlink-ok/chart-icons/tasmobackup.png keywords: @@ -25,5 +20,11 @@ maintainers: name: tasmobackup sources: - https://github.com/truecharts/charts/tree/master/charts/incubator/tasmobackup + - https://github.com/danmed/TasmoBackupV1 type: application -version: 2.0.9 +version: 3.0.0 +annotations: + truecharts.org/catagories: | + - HomeAutomation + - Network-Management + truecharts.org/SCALE-support: "true" diff --git a/charts/incubator/tasmobackup/questions.yaml b/charts/incubator/tasmobackup/questions.yaml index bebad7d6e33..85e5ee5b2b3 100644 --- a/charts/incubator/tasmobackup/questions.yaml +++ b/charts/incubator/tasmobackup/questions.yaml @@ -25,22 +25,19 @@ questions: description: "Container Variable DBTYPE" schema: type: string + required: true default: "sqlite" - variable: DBNAME label: "DBNAME" description: "Container Variable DBNAME" schema: type: string + required: true default: "data/tasmobackup" # 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 @@ -61,8 +58,8 @@ questions: # Include{serviceList} # Include{persistenceRoot} - variable: data - label: "data Storage" - description: "Container Path varwwwhtmldata" + label: "App Data Storage" + description: "Stores the Application Data." schema: additional_attrs: true type: dict diff --git a/charts/incubator/tasmobackup/templates/common.yaml b/charts/incubator/tasmobackup/templates/common.yaml index cbf66c20818..b51394e00a4 100644 --- a/charts/incubator/tasmobackup/templates/common.yaml +++ b/charts/incubator/tasmobackup/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/tasmobackup/values.yaml b/charts/incubator/tasmobackup/values.yaml index d09087cb12c..95ebd88b9e7 100644 --- a/charts/incubator/tasmobackup/values.yaml +++ b/charts/incubator/tasmobackup/values.yaml @@ -5,23 +5,35 @@ image: pullPolicy: IfNotPresent repository: tccr.io/truecharts/tasmobackup tag: latest@sha256:f191e4de7867b74936d33cbb4d02ddc21515a0bc9327c9544174d3e88e2c5768 -persistence: - data: - enabled: true - mountPath: /var/www/html/data -podSecurityContext: - runAsGroup: 0 - runAsUser: 0 + securityContext: - readOnlyRootFilesystem: false - runAsNonRoot: false + container: + readOnlyRootFilesystem: false + runAsNonRoot: false + runAsUser: 0 + runAsGroup: 0 + +workload: + main: + podSpec: + containers: + main: + env: + DBNAME: data/tasmobackup + DBTYPE: sqlite service: main: ports: main: port: 8259 - protocol: TCP + protocol: http targetPort: 80 +persistence: + data: + enabled: true + mountPath: /var/www/html/data + portal: - enabled: true + open: + enabled: true