From 9bc3a1a6e4f6baed659218d3fe2f86935d9d66f8 Mon Sep 17 00:00:00 2001 From: kqmaverick <121722567+kqmaverick@users.noreply.github.com> Date: Sat, 18 Nov 2023 08:27:26 -0800 Subject: [PATCH] migrate(duplicacy): migrate to new common (#15075) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** Migrate duplicacy to new common ⚒️ 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:** - [ ] ⚖️ 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._ --- charts/incubator/duplicacy/Chart.yaml | 6 +- charts/incubator/duplicacy/questions.yaml | 69 +++++++++---------- .../incubator/duplicacy/templates/NOTES.txt | 1 + .../incubator/duplicacy/templates/common.yaml | 2 +- charts/incubator/duplicacy/values.yaml | 23 +++---- 5 files changed, 47 insertions(+), 54 deletions(-) create mode 100644 charts/incubator/duplicacy/templates/NOTES.txt diff --git a/charts/incubator/duplicacy/Chart.yaml b/charts/incubator/duplicacy/Chart.yaml index 1c50d50d4e6..c2a3dec7abe 100644 --- a/charts/incubator/duplicacy/Chart.yaml +++ b/charts/incubator/duplicacy/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -appVersion: "latest" +appVersion: "1.7.2" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 11.1.2 + version: 14.3.5 deprecated: false description: A new generation cross-platform cloud backup tool. home: https://truecharts.org/charts/incubator/duplicacy @@ -21,7 +21,7 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/incubator/duplicacy - https://hotio.dev/containers/duplicacy type: application -version: 2.0.12 +version: 3.0.0 annotations: truecharts.org/category: Backup truecharts.org/SCALE-support: "true" diff --git a/charts/incubator/duplicacy/questions.yaml b/charts/incubator/duplicacy/questions.yaml index 5eaa12907a7..23bbe44244e 100644 --- a/charts/incubator/duplicacy/questions.yaml +++ b/charts/incubator/duplicacy/questions.yaml @@ -10,29 +10,26 @@ questions: # Include{replicas1} # Include{podSpec} # Include{containerMain} + + # Include{containerBasic} # Include{containerAdvanced} # 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: 3875 @@ -42,24 +39,24 @@ questions: # Include{serviceList} # Include{persistenceRoot} - variable: config - label: App Config Storage - description: Stores the Application Configuration. + label: "App Config Storage" + description: "Stores the Application Configuration." schema: additional_attrs: true type: dict attrs: # Include{persistenceBasic} - variable: cache - label: App Cache Storage - description: Stores the Application Cache. + label: "App Cache Storage" + description: "Stores the Application Cache." schema: additional_attrs: true type: dict attrs: # Include{persistenceBasic} - variable: logs - label: App Logs Storage - description: Stores the Application Logs. + label: "App Logs Storage" + description: "Stores the Application Logs." schema: additional_attrs: true type: dict @@ -68,7 +65,7 @@ questions: # Include{persistenceList} # Include{ingressRoot} - variable: main - label: Main Ingress + label: "Main Ingress" schema: additional_attrs: true type: dict @@ -78,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 this App 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/duplicacy/templates/NOTES.txt b/charts/incubator/duplicacy/templates/NOTES.txt new file mode 100644 index 00000000000..efcb74cb772 --- /dev/null +++ b/charts/incubator/duplicacy/templates/NOTES.txt @@ -0,0 +1 @@ +{{- include "tc.v1.common.lib.chart.notes" $ -}} diff --git a/charts/incubator/duplicacy/templates/common.yaml b/charts/incubator/duplicacy/templates/common.yaml index cbf66c20818..78d963fb168 100644 --- a/charts/incubator/duplicacy/templates/common.yaml +++ b/charts/incubator/duplicacy/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "tc.common.loader.all" . }} +{{ include "tc.v1.common.loader.all" . }} diff --git a/charts/incubator/duplicacy/values.yaml b/charts/incubator/duplicacy/values.yaml index 66ea61a97bd..6a55a051154 100644 --- a/charts/incubator/duplicacy/values.yaml +++ b/charts/incubator/duplicacy/values.yaml @@ -1,24 +1,19 @@ image: pullPolicy: IfNotPresent - repository: tccr.io/truecharts/duplicacy - tag: latest@sha256:bbf901cf8b422e74893a69ee85b72aa8c4dfa094e1a96bdcf5215e7f4199b450 - -podSecurityContext: - runAsGroup: 0 - runAsUser: 0 - + repository: ghcr.io/hotio/duplicacy + tag: release-1.7.2@sha256:b2c30bc96e9b7e946d97c64ee543440994845ba3f74ff87e5de9ce797ab06347 securityContext: - readOnlyRootFilesystem: false - runAsNonRoot: false - + container: + runAsGroup: 0 + runAsUser: 0 + readOnlyRootFilesystem: false service: main: ports: main: port: 3875 - protocol: HTTP + protocol: http targetPort: 3875 - persistence: config: enabled: true @@ -29,6 +24,6 @@ persistence: logs: enabled: true mountPath: /logs - portal: - enabled: true + open: + enabled: true