From ab37a261973e6eaec02aec08b1d0062d8ebfe777 Mon Sep 17 00:00:00 2001 From: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com> Date: Tue, 9 Jan 2024 13:10:27 -0500 Subject: [PATCH] fix(storm) add the port variable, clean up the gui and set a static semver tag for storm. (#17054) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** Clean up the chart, added additional options, housekeeping, and set a static version for the image. ⚒️ Fixes #17051 **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [X] 🪛 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: Kjeld Schouten Co-authored-by: Kjeld Schouten --- charts/stable/storm/Chart.yaml | 10 +++--- charts/stable/storm/questions.yaml | 41 +++++++++++++++---------- charts/stable/storm/templates/NOTES.txt | 1 + charts/stable/storm/values.yaml | 16 ++++++---- 4 files changed, 40 insertions(+), 28 deletions(-) create mode 100644 charts/stable/storm/templates/NOTES.txt diff --git a/charts/stable/storm/Chart.yaml b/charts/stable/storm/Chart.yaml index d751b903a1a..aa3830ed8cd 100644 --- a/charts/stable/storm/Chart.yaml +++ b/charts/stable/storm/Chart.yaml @@ -2,15 +2,15 @@ kubeVersion: ">=1.24.0-0" apiVersion: v2 name: storm version: 4.1.6 -appVersion: latest -description: Introducing Storm -home: https://truecharts.org/charts/incubator/storm +appVersion: "1.3.0" +description: A Modern Deluge Interface. +home: https://truecharts.org/charts/stable/storm icon: https://truecharts.org/img/hotlink-ok/chart-icons/storm.png deprecated: false sources: - https://github.com/relvacode/storm/pkgs/container/storm - https://github.com/relvacode/storm - - https://github.com/truecharts/charts/tree/master/charts/incubator/storm + - https://github.com/truecharts/charts/tree/master/charts/stable/storm - https://ghcr.io/relvacode/storm maintainers: - name: TrueCharts @@ -34,5 +34,5 @@ annotations: truecharts.org/category: Downloaders truecharts.org/max_helm_version: "3.13" truecharts.org/min_helm_version: "3.12" - truecharts.org/train: incubator + truecharts.org/train: stable type: application diff --git a/charts/stable/storm/questions.yaml b/charts/stable/storm/questions.yaml index 8a13ab21ffa..a04f16f43fd 100644 --- a/charts/stable/storm/questions.yaml +++ b/charts/stable/storm/questions.yaml @@ -9,6 +9,7 @@ questions: # Include{replicas1} # Include{podSpec} # Include{containerMain} + - variable: env label: Image Environment schema: @@ -16,43 +17,49 @@ questions: type: dict attrs: - variable: DELUGE_RPC_HOSTNAME - label: "DELUGE_RPC_HOSTNAME" - description: "Change this to the current name for the deluge container you want to connect storms webUI to" + label: Deluge RPC Hostname + description: "The Deluge RPC hostname." schema: type: string default: "" + - variable: DELUGE_RPC_PORT + label: Deluge RPC Port + description: "The Deluge RPC port." + schema: + type: int + default: 58846 - variable: DELUGE_RPC_USERNAME - label: "DELUGE_RPC_USERNAME" - description: "The username storm will use to connect to the deluge container. Set this in appdatadelugeauth file" + label: Deluge RPC Username + description: "The username from Deluge auth." schema: type: string default: "" - variable: DELUGE_RPC_PASSWORD - label: "DELUGE_RPC_PASSWORD" - description: "The password storm will use to connect to the deluge container. Set this in appdatadelugeauth file" + label: Deluge RPC Password + description: "The password from Deluge auth." schema: type: string default: "" - variable: DELUGE_RPC_VERSION - label: "DELUGE_RPC_VERSION" - description: "RPC connection version to use.Depends on your deluge version." + label: Deluge RPC Version + description: "RPC connection version to use. (Depends on your deluge version)" schema: type: string default: "v2" - variable: STORM_API_KEY - label: "STORM_API_KEY" - description: "Set this to a reasonably secure password.Any requests made to Storm must now provide the API key in the request." + label: Storm API Key + description: "Enable authentication for the Storm API." schema: type: string default: "" + +# 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 diff --git a/charts/stable/storm/templates/NOTES.txt b/charts/stable/storm/templates/NOTES.txt new file mode 100644 index 00000000000..efcb74cb772 --- /dev/null +++ b/charts/stable/storm/templates/NOTES.txt @@ -0,0 +1 @@ +{{- include "tc.v1.common.lib.chart.notes" $ -}} diff --git a/charts/stable/storm/values.yaml b/charts/stable/storm/values.yaml index 7e4957b7982..bf9c0892b6f 100644 --- a/charts/stable/storm/values.yaml +++ b/charts/stable/storm/values.yaml @@ -1,23 +1,22 @@ image: pullPolicy: IfNotPresent repository: ghcr.io/relvacode/storm - tag: latest@sha256:9f50d643af5a83424331a93a212e320407a1a1577f0202e6141f7f5245d2711a -persistence: {} -portal: - open: - enabled: true + tag: v1.3.0@sha256:9f50d643af5a83424331a93a212e320407a1a1577f0202e6141f7f5245d2711a + securityContext: container: readOnlyRootFilesystem: false runAsGroup: 0 runAsUser: 0 + service: main: ports: main: port: 8221 - protocol: tcp + protocol: http targetPort: 8221 + workload: main: podSpec: @@ -25,7 +24,12 @@ workload: main: env: DELUGE_RPC_HOSTNAME: "" + DELUGE_RPC_PORT: 58846 DELUGE_RPC_PASSWORD: "" DELUGE_RPC_USERNAME: "" DELUGE_RPC_VERSION: v2 STORM_API_KEY: "" + +portal: + open: + enabled: true