From 892cff30a79a865ce7ec596b46d2a9238de9dd61 Mon Sep 17 00:00:00 2001 From: StevenMcElligott <89483932+StevenMcElligott@users.noreply.github.com> Date: Mon, 15 May 2023 04:02:41 -0400 Subject: [PATCH] feat(muse): Update common / move to stable (#8923) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** Since it's missing from the catalog and the `incubator` version was working took the opportunity to fix common and move it to stable. Not exactly the worlds most complicated chart to port so might as well have one less to do ⚒️ Fixes #8909 **⚙️ Type of change** - [x] ⚙️ 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 - [ ] 👀 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 - [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 **➕ 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/muse/questions.yaml | 159 ------------------ charts/incubator/muse/templates/common.yaml | 1 - charts/incubator/muse/values.yaml | 39 ----- charts/{incubator => stable}/muse/.helmignore | 0 .../{incubator => stable}/muse/CHANGELOG.md | 0 charts/{incubator => stable}/muse/Chart.yaml | 4 +- charts/{incubator => stable}/muse/README.md | 0 .../muse/docs/installation_notes.md | 0 charts/{incubator => stable}/muse/icon.png | Bin charts/stable/muse/questions.yaml | 148 ++++++++++++++++ charts/stable/muse/templates/common.yaml | 1 + charts/stable/muse/values.yaml | 51 ++++++ 12 files changed, 202 insertions(+), 201 deletions(-) delete mode 100644 charts/incubator/muse/questions.yaml delete mode 100644 charts/incubator/muse/templates/common.yaml delete mode 100644 charts/incubator/muse/values.yaml rename charts/{incubator => stable}/muse/.helmignore (100%) rename charts/{incubator => stable}/muse/CHANGELOG.md (100%) rename charts/{incubator => stable}/muse/Chart.yaml (95%) rename charts/{incubator => stable}/muse/README.md (100%) rename charts/{incubator => stable}/muse/docs/installation_notes.md (100%) rename charts/{incubator => stable}/muse/icon.png (100%) create mode 100644 charts/stable/muse/questions.yaml create mode 100644 charts/stable/muse/templates/common.yaml create mode 100644 charts/stable/muse/values.yaml diff --git a/charts/incubator/muse/questions.yaml b/charts/incubator/muse/questions.yaml deleted file mode 100644 index 7d9a2e4332d..00000000000 --- a/charts/incubator/muse/questions.yaml +++ /dev/null @@ -1,159 +0,0 @@ -# Include{groups} -portals: {} -questions: -# Include{global} -# Include{workload} -# Include{workloadDeployment} - -# Include{replicas1} -# Include{podSpec} -# Include{containerMain} -# Include{containerBasic} -# Include{containerAdvanced} - - - variable: env - group: App Configuration - label: Image Environment - schema: - additional_attrs: true - type: dict - attrs: - - variable: DISCORD_TOKEN - label: Discord Token - schema: - type: string - required: true - default: "" - - variable: YOUTUBE_API_KEY - label: Youtube API Key - description: Google's Developer Console credentials API key. - schema: - type: string - required: true - default: "" - - variable: SPOTIFY_CLIENT_ID - label: Spotify Client Id - schema: - type: string - required: true - default: "" - - variable: SPOTIFY_CLIENT_SECRET - label: Spotify Client Secret - schema: - type: string - required: true - default: "" - - variable: advanced - label: Show Advanced Settings - schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: CACHE_LIMIT - label: Cache Limit - schema: - type: string - required: true - default: 2GB - - variable: BOT_STATUS - label: Bot Status - schema: - type: string - default: online - enum: - - value: online - description: Online - - value: idle - description: Away - - value: dnd - description: Do not Disturb - - variable: BOT_ACTIVITY_TYPE - label: Bot Activity Type - schema: - type: string - default: PLAYING - enum: - - value: PLAYING - description: Playing - - value: LISTENING - description: Listening - - value: WATCHING - description: Watching - - value: STREAMING - description: Streaming - - variable: BOT_ACTIVITY - label: Bot Activity - schema: - type: string - default: "" - - variable: BOT_ACTIVITY_URL - label: Bot Activity URL - description: requires either a youtube or twitch stream to be set. - schema: - type: string - default: "" - show_if: [[BOT_ACTIVITY_TYPE, "=", "STREAMING"]] - - variable: REGISTER_COMMANDS_ON_BOT - label: Register Commands On Bot - description: Enable Bot-wide commands if your muse instance is running on 10+ guilds. - schema: - type: boolean - default: false -# Include{containerConfig} -# Include{serviceExpertRoot} - default: false -# Include{serviceExpert} -# Include{serviceList} -# Include{persistenceRoot} - - variable: config - label: App Config Storage - description: Stores the Application Configuration. - schema: - additional_attrs: true - type: dict - attrs: -# Include{persistenceBasic} -# Include{persistenceList} -# Include{ingressRoot} - - variable: main - label: Main Ingress - schema: - additional_attrs: true - type: dict - attrs: -# Include{ingressDefault} -# Include{ingressTLS} -# Include{ingressTraefik} -# Include{ingressList} - -# 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 -# Include{securityContextContainer} -# Include{securityContextAdvanced} -# Include{securityContextPod} - - variable: fsGroup - label: fsGroup - description: The group that should own ALL storage. - schema: - type: int - default: 568 - -# Include{resources} -# Include{advanced} -# Include{addons} -# Include{codeserver} -# Include{netshoot} -# Include{vpn} -# Include{documentation} diff --git a/charts/incubator/muse/templates/common.yaml b/charts/incubator/muse/templates/common.yaml deleted file mode 100644 index c1a366e1cf0..00000000000 --- a/charts/incubator/muse/templates/common.yaml +++ /dev/null @@ -1 +0,0 @@ -{{ include "tc.common.loader.all" . }} diff --git a/charts/incubator/muse/values.yaml b/charts/incubator/muse/values.yaml deleted file mode 100644 index 0d0f4c1c0ae..00000000000 --- a/charts/incubator/muse/values.yaml +++ /dev/null @@ -1,39 +0,0 @@ -image: - repository: tccr.io/truecharts/muse - pullPolicy: IfNotPresent - tag: 2.2.4@sha256:95198b1b560aacfbfd3332b5d74f6482dafb3b7cd7510ea4d744c30f1fc08acb - -securityContext: - runAsNonRoot: false - readOnlyRootFilesystem: false - -podSecurityContext: - runAsUser: 0 - runAsGroup: 0 - -service: - main: - enabled: false - ports: - main: - enabled: false - -env: - DATA_DIR: /config - DISCORD_TOKEN: "" - SPOTIFY_CLIENT_ID: "" - SPOTIFY_CLIENT_SECRET: "" - YOUTUBE_API_KEY: "" - # CACHE_LIMIT: 2GB - # BOT_STATUS: online - # BOT_ACTIVITY_TYPE: PLAYING - # BOT_ACTIVITY: A incubator app - # BOT_ACTIVITY_URL: https://www.youtube.com/truecharts - -persistence: - config: - enabled: true - mountPath: /config - -portal: - enabled: false diff --git a/charts/incubator/muse/.helmignore b/charts/stable/muse/.helmignore similarity index 100% rename from charts/incubator/muse/.helmignore rename to charts/stable/muse/.helmignore diff --git a/charts/incubator/muse/CHANGELOG.md b/charts/stable/muse/CHANGELOG.md similarity index 100% rename from charts/incubator/muse/CHANGELOG.md rename to charts/stable/muse/CHANGELOG.md diff --git a/charts/incubator/muse/Chart.yaml b/charts/stable/muse/Chart.yaml similarity index 95% rename from charts/incubator/muse/Chart.yaml rename to charts/stable/muse/Chart.yaml index 311178b07b3..3fc835939f2 100644 --- a/charts/incubator/muse/Chart.yaml +++ b/charts/stable/muse/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.2.4" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 11.1.2 + version: 12.6.6 deprecated: false description: A self-hosted midwestern Discord music bot that doesn't suck. home: https://truecharts.org/charts/incubator/muse @@ -22,7 +22,7 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/incubator/muse - https://github.com/codetheweb/muse type: application -version: 0.0.3 +version: 1.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/incubator/muse/README.md b/charts/stable/muse/README.md similarity index 100% rename from charts/incubator/muse/README.md rename to charts/stable/muse/README.md diff --git a/charts/incubator/muse/docs/installation_notes.md b/charts/stable/muse/docs/installation_notes.md similarity index 100% rename from charts/incubator/muse/docs/installation_notes.md rename to charts/stable/muse/docs/installation_notes.md diff --git a/charts/incubator/muse/icon.png b/charts/stable/muse/icon.png similarity index 100% rename from charts/incubator/muse/icon.png rename to charts/stable/muse/icon.png diff --git a/charts/stable/muse/questions.yaml b/charts/stable/muse/questions.yaml new file mode 100644 index 00000000000..bcd8f588ca1 --- /dev/null +++ b/charts/stable/muse/questions.yaml @@ -0,0 +1,148 @@ +# Include{groups} +portals: {} +questions: +# Include{global} +# Include{workload} +# Include{workloadDeployment} + +# Include{replicas1} +# Include{podSpec} +# Include{containerMain} +# Include{containerBasic} +# Include{containerAdvanced} + + - variable: env + group: App Configuration + label: Image Environment + schema: + additional_attrs: true + type: dict + attrs: + - variable: DISCORD_TOKEN + label: Discord Token + schema: + type: string + required: true + default: "" + - variable: YOUTUBE_API_KEY + label: Youtube API Key + description: Google's Developer Console credentials API key. + schema: + type: string + required: true + default: "" + - variable: SPOTIFY_CLIENT_ID + label: Spotify Client Id + schema: + type: string + required: true + default: "" + - variable: SPOTIFY_CLIENT_SECRET + label: Spotify Client Secret + schema: + type: string + required: true + default: "" + - variable: advanced + label: Show Advanced Settings + schema: + type: boolean + default: false + show_subquestions_if: true + subquestions: + - variable: CACHE_LIMIT + label: Cache Limit + schema: + type: string + required: true + default: 2GB + - variable: BOT_STATUS + label: Bot Status + schema: + type: string + default: online + enum: + - value: online + description: Online + - value: idle + description: Away + - value: dnd + description: Do not Disturb + - variable: BOT_ACTIVITY_TYPE + label: Bot Activity Type + schema: + type: string + default: PLAYING + enum: + - value: PLAYING + description: Playing + - value: LISTENING + description: Listening + - value: WATCHING + description: Watching + - value: STREAMING + description: Streaming + - variable: BOT_ACTIVITY + label: Bot Activity + schema: + type: string + default: "" + - variable: BOT_ACTIVITY_URL + label: Bot Activity URL + description: requires either a youtube or twitch stream to be set. + schema: + type: string + default: "" + show_if: [[BOT_ACTIVITY_TYPE, "=", "STREAMING"]] + - variable: REGISTER_COMMANDS_ON_BOT + label: Register Commands On Bot + description: Enable Bot-wide commands if your muse instance is running on 10+ guilds. + schema: + type: boolean + default: false +# Include{containerConfig} +# Include{serviceExpertRoot} + default: false +# Include{serviceExpert} +# Include{serviceList} +# Include{persistenceRoot} + - variable: config + label: App Config Storage + description: Stores the Application Configuration. + schema: + additional_attrs: true + type: dict + attrs: +# Include{persistenceBasic} +# Include{persistenceList} + +# Include{securityContextRoot} + - 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 + +# Include{resources} +# Include{advanced} +# Include{addons} +# Include{codeserver} +# Include{netshoot} +# Include{vpn} +# Include{documentation} diff --git a/charts/stable/muse/templates/common.yaml b/charts/stable/muse/templates/common.yaml new file mode 100644 index 00000000000..b51394e00a4 --- /dev/null +++ b/charts/stable/muse/templates/common.yaml @@ -0,0 +1 @@ +{{ include "tc.v1.common.loader.all" . }} diff --git a/charts/stable/muse/values.yaml b/charts/stable/muse/values.yaml new file mode 100644 index 00000000000..dc8e791368f --- /dev/null +++ b/charts/stable/muse/values.yaml @@ -0,0 +1,51 @@ +image: + repository: tccr.io/truecharts/muse + pullPolicy: IfNotPresent + tag: 2.2.4@sha256:95198b1b560aacfbfd3332b5d74f6482dafb3b7cd7510ea4d744c30f1fc08acb + +securityContext: + container: + runAsNonRoot: false + readOnlyRootFilesystem: false + runAsUser: 0 + runAsGroup: 0 + +service: + main: + enabled: false + ports: + main: + enabled: false + +workload: + main: + podSpec: + containers: + main: + probes: + liveness: + enabled: false + readiness: + enabled: false + startup: + enabled: false + env: + DATA_DIR: /config + DISCORD_TOKEN: "" + SPOTIFY_CLIENT_ID: "" + SPOTIFY_CLIENT_SECRET: "" + YOUTUBE_API_KEY: "" + # CACHE_LIMIT: 2GB + # BOT_STATUS: online + # BOT_ACTIVITY_TYPE: PLAYING + # BOT_ACTIVITY: A incubator app + # BOT_ACTIVITY_URL: https://www.youtube.com/truecharts + +persistence: + config: + enabled: true + mountPath: /config + +portal: + open: + enabled: false