From 31937a921793a031e12aaa0c7977fda5d7a059aa Mon Sep 17 00:00:00 2001 From: StevenMcElligott <89483932+StevenMcElligott@users.noreply.github.com> Date: Sat, 2 Dec 2023 18:19:25 -0500 Subject: [PATCH] fix(questions): Fix Incubator questions (#15623) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** ⚒️ Fixes # **⚙️ Type of change** - [ ] ⚙️ 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 - [ ] ⬆️ 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._ --- .../fireflyiii-data-importer/questions.yaml | 45 ++-- charts/incubator/flatnotes/questions.yaml | 90 ++++---- .../incubator/jackett2telegram/questions.yaml | 101 +++++---- charts/incubator/kavitaemail/questions.yaml | 142 ++++++------- charts/incubator/mineos/questions.yaml | 19 +- .../incubator/ra-rom-processor/questions.yaml | 197 +++++++++--------- charts/incubator/thumba/questions.yaml | 119 +++++------ 7 files changed, 340 insertions(+), 373 deletions(-) diff --git a/charts/incubator/fireflyiii-data-importer/questions.yaml b/charts/incubator/fireflyiii-data-importer/questions.yaml index 99a5d03e292..fa1a319f1f2 100644 --- a/charts/incubator/fireflyiii-data-importer/questions.yaml +++ b/charts/incubator/fireflyiii-data-importer/questions.yaml @@ -10,12 +10,6 @@ questions: # Include{replicas1} # Include{podSpec} # Include{containerMain} -# Include{containerBasic} -# Include{containerAdvanced} - -# Include{containerConfig} -# Include{podOptions} -# Include{serviceRoot} - variable: env group: "App Configuration" label: "Image Environment" @@ -72,6 +66,7 @@ questions: default: "" # Include{containerBasic} # Include{containerAdvanced} + # Include{containerConfig} # Include{podOptions} # Include{serviceRoot} @@ -114,28 +109,28 @@ questions: # Include{ingressAdvanced} # Include{ingressList} -# 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 of the user running the application" - schema: - type: int - default: 0 +# 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 + - 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/flatnotes/questions.yaml b/charts/incubator/flatnotes/questions.yaml index aa2458286f8..ba1427c1631 100644 --- a/charts/incubator/flatnotes/questions.yaml +++ b/charts/incubator/flatnotes/questions.yaml @@ -13,35 +13,31 @@ questions: # Include{containerBasic} # Include{containerAdvanced} - - variable: env - group: App Configuration - label: Image Environment - schema: - additional_attrs: true - type: dict - attrs: - - variable: FLATNOTES_USERNAME - label: Username - schema: - type: string - required: true - default: "" - - variable: FLATNOTES_PASSWORD - label: Password - schema: - type: string - private: true - required: true - default: "" - - variable: FLATNOTES_SESSION_EXPIRY_DAYS - label: Session Expiry Days - schema: - type: int - default: 30 -# Include{containerBasic} -# Include{containerAdvanced} -# Include{containerConfig} -# Include{podOptions} + - variable: env + group: "App Configuration" + label: "Image Environment" + schema: + additional_attrs: true + type: dict + attrs: + - variable: FLATNOTES_USERNAME + label: Username + schema: + type: string + required: true + default: "" + - variable: FLATNOTES_PASSWORD + label: Password + schema: + type: string + private: true + required: true + default: "" + - variable: FLATNOTES_SESSION_EXPIRY_DAYS + label: Session Expiry Days + schema: + type: int + default: 30 # Include{serviceRoot} - variable: main label: Main Service @@ -92,27 +88,27 @@ questions: # Include{ingressList} # Include{securityContextRoot} - - variable: runAsUser - label: "runAsUser" - description: "The UserID of the user running the application" - schema: - type: int - default: 1000 - - variable: runAsGroup - label: "runAsGroup" - description: "The groupID of the user running the application" - schema: - type: int - default: 1000 + - variable: runAsUser + label: runAsUser + description: The UserID of the user running the application + schema: + type: int + default: 1000 + - variable: runAsGroup + label: runAsGroup + description: The groupID this App of the user running the application + schema: + type: int + default: 1000 # 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/jackett2telegram/questions.yaml b/charts/incubator/jackett2telegram/questions.yaml index 20eb450ce2e..d4a177eb55d 100644 --- a/charts/incubator/jackett2telegram/questions.yaml +++ b/charts/incubator/jackett2telegram/questions.yaml @@ -11,40 +11,36 @@ questions: # Include{containerBasic} # Include{containerAdvanced} - - variable: env - group: App Configuration - label: Image Environment - schema: - additional_attrs: true - type: dict - attrs: - - variable: TOKEN - label: Token - description: Telegram Bot Token. - schema: - type: string - required: true - private: true - default: "" - - variable: CHATID - label: Chat ID - description: Telegram Bot Chat ID. - schema: - type: string - private: true - required: true - default: "" - - variable: DELAY - label: Delay - description: Delay in seconds. - schema: - type: int - required: true - default: 600 -# Include{containerBasic} -# Include{containerAdvanced} -# Include{containerConfig} -# Include{podOptions} + - variable: env + group: "App Configuration" + label: "Image Environment" + schema: + additional_attrs: true + type: dict + attrs: + - variable: TOKEN + label: Token + description: Telegram Bot Token. + schema: + type: string + required: true + private: true + default: "" + - variable: CHATID + label: Chat ID + description: Telegram Bot Chat ID. + schema: + type: string + private: true + required: true + default: "" + - variable: DELAY + label: Delay + description: Delay in seconds. + schema: + type: int + required: true + default: 600 # Include{serviceExpertRoot} # Include{serviceExpert} # Include{serviceList} @@ -64,31 +60,30 @@ questions: 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: 568 - - variable: runAsGroup - label: "runAsGroup" - description: "The groupID of the user running the application" - schema: - type: int - default: 568 + - variable: runAsUser + label: runAsUser + description: The UserID of the user running the application + schema: + type: int + default: 568 + - variable: runAsGroup + label: runAsGroup + description: The groupID this App of the user running the application + schema: + type: int + default: 568 # 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/kavitaemail/questions.yaml b/charts/incubator/kavitaemail/questions.yaml index e2650a665c3..0162048e471 100644 --- a/charts/incubator/kavitaemail/questions.yaml +++ b/charts/incubator/kavitaemail/questions.yaml @@ -11,60 +11,56 @@ questions: # Include{containerBasic} # Include{containerAdvanced} - - variable: env - group: App Configuration - label: Image Environment - schema: - additional_attrs: true - type: dict - attrs: - - variable: SMTP_USER - label: SMTP Username - description: Set the SMTP username - schema: - type: string - required: true - default: "" - - variable: SMTP_PASS - label: SMTP Password - description: Set the SMTP password - schema: - type: string - required: true - private: true - default: "" - - variable: SMTP_HOST - label: SMTP Host - description: Set the SMTP host - schema: - type: string - required: true - default: "" - - variable: SMTP_PORT - label: SMTP Port - description: Set the SMTP port - schema: - type: int - required: true - default: 587 - - variable: SEND_ADDR - label: Sender Address - description: Set the sender email - schema: - type: string - required: true - default: "" - - variable: DISP_NAME - label: Display Name - description: Set the display name - schema: - type: string - required: true - default: "" -# Include{containerBasic} -# Include{containerAdvanced} -# Include{containerConfig} -# Include{podOptions} + - variable: env + group: "App Configuration" + label: "Image Environment" + schema: + additional_attrs: true + type: dict + attrs: + - variable: SMTP_USER + label: SMTP Username + description: Set the SMTP username + schema: + type: string + required: true + default: "" + - variable: SMTP_PASS + label: SMTP Password + description: Set the SMTP password + schema: + type: string + required: true + private: true + default: "" + - variable: SMTP_HOST + label: SMTP Host + description: Set the SMTP host + schema: + type: string + required: true + default: "" + - variable: SMTP_PORT + label: SMTP Port + description: Set the SMTP port + schema: + type: int + required: true + default: 587 + - variable: SEND_ADDR + label: Sender Address + description: Set the sender email + schema: + type: string + required: true + default: "" + - variable: DISP_NAME + label: Display Name + description: Set the display name + schema: + type: string + required: true + default: "" # Include{serviceRoot} - variable: main label: Main Service @@ -114,28 +110,28 @@ questions: # Include{ingressAdvanced} # Include{ingressList} -# 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 of the user running the application" - schema: - type: int - default: 0 +# 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: 0 + - variable: fsGroup + label: fsGroup + description: The group that should own ALL storage. + schema: + type: int + default: 0 # Include{resources} # Include{advanced} diff --git a/charts/incubator/mineos/questions.yaml b/charts/incubator/mineos/questions.yaml index 71239e117fa..036d80fb1b8 100644 --- a/charts/incubator/mineos/questions.yaml +++ b/charts/incubator/mineos/questions.yaml @@ -10,12 +10,6 @@ questions: # Include{replicas1} # Include{podSpec} # Include{containerMain} -# Include{containerBasic} -# Include{containerAdvanced} - -# Include{containerConfig} -# Include{podOptions} -# Include{serviceRoot} - variable: env label: Image Environment schema: @@ -45,6 +39,7 @@ questions: default: false # Include{containerBasic} # Include{containerAdvanced} + # Include{containerConfig} # Include{podOptions} # Include{serviceRoot} @@ -451,12 +446,12 @@ questions: schema: type: int default: 0 - - variable: runAsGroup - label: "runAsGroup" - description: "The groupID 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} diff --git a/charts/incubator/ra-rom-processor/questions.yaml b/charts/incubator/ra-rom-processor/questions.yaml index 4687ca8b202..cd737968bc2 100644 --- a/charts/incubator/ra-rom-processor/questions.yaml +++ b/charts/incubator/ra-rom-processor/questions.yaml @@ -11,87 +11,83 @@ questions: # Include{containerBasic} # Include{containerAdvanced} - - variable: env - group: App Configuration - label: Image Environment - schema: - additional_attrs: true - type: dict - attrs: - - variable: ScreenscraperUsername - label: Screenscraper Username - description: Username for screenscraper.fr. - schema: - type: string - default: "" - - variable: ScreenscraperPassword - label: Screenscraper Password - description: Password for screenscraper.fr. - schema: - type: string - default: "" - - variable: AutoStart - label: Auto Start - description: If checked runs script automatically on startup - schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: ScriptInterval - label: Script Interval - description: "Amount of time between each script run | #s or #m or #h or #d s = seconds, m = minutes, h = hours, d = days." - schema: - type: string - default: 1h - - variable: DeDupe - label: DeDupe - description: If checked this setting further reduces the final ROMs list per platform, by removing duplicates. - schema: - type: boolean - default: false - - variable: AquireRomSets - label: Aquire Rom Sets - description: Enabling this will have the script attempt to pull valid ROM sets from archive.org for processing. - schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: ConcurrentDownloadThreads - label: Concurrent Download Threads - description: Number of concurrent threads to increase download speeds. - schema: - type: int - default: 5 - - variable: EnableUnsupportedPlatforms - label: Enable Unsupported Platforms - description: Enabling this will allow the script to import and scrape ROMs for platforms without RA hashes. - schema: - type: boolean - default: false - - variable: ScrapeMetadata - label: Scrape Metadata - description: Enabling this will allow the script to process the ROMs with skyscraper. - schema: - type: boolean - default: false - - variable: keepBackupsOfImportedRoms - label: keep Backups Of Imported Roms - description: If unchecked this setting will only keep a single copy of each ROM, reduces the required amount of storage space. - schema: - type: boolean - default: true - - variable: skyscraperLanguagePreference - label: Skyscaper Language - description: Set to preferred language for Metadata. - schema: - type: string - default: en -# Include{containerBasic} -# Include{containerAdvanced} -# Include{containerConfig} -# Include{podOptions} + - variable: env + group: "App Configuration" + label: "Image Environment" + schema: + additional_attrs: true + type: dict + attrs: + - variable: ScreenscraperUsername + label: Screenscraper Username + description: Username for screenscraper.fr. + schema: + type: string + default: "" + - variable: ScreenscraperPassword + label: Screenscraper Password + description: Password for screenscraper.fr. + schema: + type: string + default: "" + - variable: AutoStart + label: Auto Start + description: If checked runs script automatically on startup + schema: + type: boolean + default: false + show_subquestions_if: true + subquestions: + - variable: ScriptInterval + label: Script Interval + description: "Amount of time between each script run | #s or #m or #h or #d s = seconds, m = minutes, h = hours, d = days." + schema: + type: string + default: 1h + - variable: DeDupe + label: DeDupe + description: If checked this setting further reduces the final ROMs list per platform, by removing duplicates. + schema: + type: boolean + default: false + - variable: AquireRomSets + label: Aquire Rom Sets + description: Enabling this will have the script attempt to pull valid ROM sets from archive.org for processing. + schema: + type: boolean + default: false + show_subquestions_if: true + subquestions: + - variable: ConcurrentDownloadThreads + label: Concurrent Download Threads + description: Number of concurrent threads to increase download speeds. + schema: + type: int + default: 5 + - variable: EnableUnsupportedPlatforms + label: Enable Unsupported Platforms + description: Enabling this will allow the script to import and scrape ROMs for platforms without RA hashes. + schema: + type: boolean + default: false + - variable: ScrapeMetadata + label: Scrape Metadata + description: Enabling this will allow the script to process the ROMs with skyscraper. + schema: + type: boolean + default: false + - variable: keepBackupsOfImportedRoms + label: keep Backups Of Imported Roms + description: If unchecked this setting will only keep a single copy of each ROM, reduces the required amount of storage space. + schema: + type: boolean + default: true + - variable: skyscraperLanguagePreference + label: Skyscaper Language + description: Set to preferred language for Metadata. + schema: + type: string + default: en # Include{serviceExpertRoot} # Include{serviceExpert} # Include{serviceList} @@ -135,31 +131,30 @@ questions: 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{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 + - 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/thumba/questions.yaml b/charts/incubator/thumba/questions.yaml index afc78d20312..ac06735a009 100644 --- a/charts/incubator/thumba/questions.yaml +++ b/charts/incubator/thumba/questions.yaml @@ -13,48 +13,44 @@ questions: # Include{containerBasic} # Include{containerAdvanced} - - variable: env - group: App Configuration - label: Image Environment - schema: - additional_attrs: true - type: dict - attrs: - - variable: GOOGLE_SEARCH_KEY - label: Google Search Key - schema: - type: string - default: "" - required: true - - variable: GOOGLE_SEARCH_CX - label: Google Search CX - schema: - type: string - default: "" - required: true - private: true - - variable: THUM_KEY_ID - label: Thum Key ID - schema: - type: string - default: "" - required: true - - variable: THUM_KEY_SECRET - label: Thum Key Secret - schema: - type: string - default: "" - required: true - private: true - - variable: NEXT_PUBLIC_HOST - label: Next Public Host - schema: - type: string - default: "http://localhost" -# Include{containerBasic} -# Include{containerAdvanced} -# Include{containerConfig} -# Include{podOptions} + - variable: env + group: "App Configuration" + label: "Image Environment" + schema: + additional_attrs: true + type: dict + attrs: + - variable: GOOGLE_SEARCH_KEY + label: Google Search Key + schema: + type: string + default: "" + required: true + - variable: GOOGLE_SEARCH_CX + label: Google Search CX + schema: + type: string + default: "" + required: true + private: true + - variable: THUM_KEY_ID + label: Thum Key ID + schema: + type: string + default: "" + required: true + - variable: THUM_KEY_SECRET + label: Thum Key Secret + schema: + type: string + default: "" + required: true + private: true + - variable: NEXT_PUBLIC_HOST + label: Next Public Host + schema: + type: string + default: "http://localhost" # Include{serviceRoot} - variable: main label: Main Service @@ -97,7 +93,6 @@ questions: additional_attrs: true type: dict attrs: -# Include{persistenceBasic} # Include{persistenceList} # Include{ingressRoot} - variable: main @@ -112,28 +107,28 @@ questions: # Include{ingressAdvanced} # Include{ingressList} -# 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 of the user running the application" - schema: - type: int - default: 0 +# 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 + - variable: fsGroup + label: fsGroup + description: The group that should own ALL storage. + schema: + type: int + default: 568 # Include{resources} # Include{advanced}