From 72e29ed695deaff9dc1ae26695a28c088d963e50 Mon Sep 17 00:00:00 2001 From: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com> Date: Thu, 4 May 2023 16:58:02 -0400 Subject: [PATCH] fix(lancache-dns) fix options not being loaded. (#8707) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** A possible fix to clean up and fix the gui for variables to show up. ⚒️ Fixes #8708 **⚙️ 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:** Some checkboxes are not being shown. **✔️ 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> Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> --- charts/stable/lancache-dns/Chart.yaml | 24 +++++++------- charts/stable/lancache-dns/questions.yaml | 39 +++++++++++++++++------ charts/stable/lancache-dns/values.yaml | 35 ++++++++++++-------- 3 files changed, 62 insertions(+), 36 deletions(-) diff --git a/charts/stable/lancache-dns/Chart.yaml b/charts/stable/lancache-dns/Chart.yaml index 468e9e2c1ec..d84ed1c3731 100644 --- a/charts/stable/lancache-dns/Chart.yaml +++ b/charts/stable/lancache-dns/Chart.yaml @@ -1,27 +1,27 @@ apiVersion: v2 -kubeVersion: ">=1.16.0-0" -name: lancache-dns -version: 4.0.9 appVersion: "latest" -description: DNS Chart service for a steam cache. -type: application +dependencies: + - name: common + repository: https://library-charts.truecharts.org + version: 12.6.1 deprecated: false +description: DNS Chart service for a steam cache. home: https://truecharts.org/charts/stable/lancache-dns icon: https://truecharts.org/img/hotlink-ok/chart-icons/lancache-dns.png keywords: - lancache-dns - dns -sources: - - https://github.com/truecharts/charts/tree/master/charts/stable/lancache-dns - - https://github.com/lancachenet/lancache-dns -dependencies: - - name: common - repository: https://library-charts.truecharts.org - version: 12.6.4 +kubeVersion: ">=1.16.0-0" maintainers: - email: info@truecharts.org name: TrueCharts url: https://truecharts.org +name: lancache-dns +sources: + - https://github.com/truecharts/charts/tree/master/charts/stable/lancache-dns + - https://github.com/lancachenet/lancache-dns +type: application +version: 4.0.10 annotations: truecharts.org/catagories: | - networking diff --git a/charts/stable/lancache-dns/questions.yaml b/charts/stable/lancache-dns/questions.yaml index 35eaa5bdd4c..4f6ab20574e 100644 --- a/charts/stable/lancache-dns/questions.yaml +++ b/charts/stable/lancache-dns/questions.yaml @@ -18,25 +18,25 @@ questions: type: dict attrs: - variable: CACHE_DOMAINS_REPO - label: "CACHE DOMAINS REPO" + label: "Cache Domains Repo" description: "The github repo url for the cache_domains files to use to populate the cdn maps." schema: type: string default: "https://github.com/uklans/cache-domains.git" - variable: CACHE_DOMAINS_BRANCH - label: "CACHE DOMAINS BRANCH" + label: "Cache Domains Branch" description: "The branch of the CACHE_DOMAINS_REPO to use" schema: type: string default: "master" - variable: UPSTREAM_DNS - label: "UPSTREAM DNS" + label: "Upstream DNS" description: "Upstream DNS server(s) the cache should use(separated by spaces). Do NOT point this at lancache-dns)" schema: type: string default: "1.1.1.1;1.0.0.1" - variable: USE_GENERIC_CACHE - label: "USE GENERIC CACHE" + label: "Use Generic Cache" description: "If you are using a single monolithic instance set this to true" schema: type: boolean @@ -44,8 +44,8 @@ questions: show_subquestions_if: true subquestions: - variable: LANCACHE_IP - label: "LANCACHE IP" - description: "Set the IP for the lancache-monolithic app only if USE_GENERIC_CACHE is true" + label: "Lancache IP" + description: "Set the IP for the lancache-monolithic" schema: type: string required: true @@ -53,23 +53,42 @@ questions: - variable: customdisable label: "Disable Cache DNS Resolvers" schema: - show_if: [["USE_GENERIC_CACHE", "=", true]] type: boolean default: false show_subquestions_if: true subquestions: - variable: DISABLE_BLIZZARD - label: "Disable BLIZZARD" + label: "Disable Blizzard" schema: type: boolean default: false - variable: DISABLE_RIOT - label: "Disable RIOT" + label: "Disable Riot" schema: type: boolean default: false - variable: DISABLE_UPLAY - label: "Disable UPLAY" + label: "Disable Uplay" + schema: + type: boolean + default: false + - variable: DISABLE_STEAM + label: "Disable Steam" + schema: + type: boolean + default: false + - variable: DISABLE_ORIGIN + label: "Disable Origin" + schema: + type: boolean + default: false + - variable: DISABLE_SONY + label: "Disable Sony" + schema: + type: boolean + default: false + - variable: DISABLE_SQUARE + label: "Disable Square" schema: type: boolean default: false diff --git a/charts/stable/lancache-dns/values.yaml b/charts/stable/lancache-dns/values.yaml index 4ff4eee6c8a..549f571842b 100644 --- a/charts/stable/lancache-dns/values.yaml +++ b/charts/stable/lancache-dns/values.yaml @@ -2,26 +2,14 @@ image: repository: tccr.io/truecharts/lancache-dns pullPolicy: IfNotPresent tag: latest@sha256:9de67e9a32730d8f4c1223eb368f92ef89ea93a9e373ac49b249cc58936335f2 -service: - main: - ports: - main: - port: 53 - targetPort: 53 - dns: - enabled: true - protocol: udp - port: 53 - targetPort: 53 -portal: - open: - enabled: false + securityContext: container: readOnlyRootFilesystem: false runAsNonRoot: false runAsUser: 0 runAsGroup: 0 + workload: main: podSpec: @@ -45,3 +33,22 @@ workload: DISABLE_BLIZZARD: false DISABLE_RIOT: false DISABLE_UPLAY: false + DISABLE_ORIGIN: false + DISABLE_SONY: false + DISABLE_SQUARE: false + +service: + main: + ports: + main: + port: 53 + targetPort: 53 + dns: + enabled: true + protocol: udp + port: 53 + targetPort: 53 + +portal: + open: + enabled: false