From 652158680f86a475ad0f3087d2e7ef252f50981d Mon Sep 17 00:00:00 2001 From: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com> Date: Sun, 4 Jun 2023 08:54:30 -0400 Subject: [PATCH] migrate(firefox) migrate firefox to new common (#9318) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** ⚒️ Fixes # **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [X] 🪛 Bugfix - [X] ⚠️ 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: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> --- charts/incubator/firefox/Chart.yaml | 30 ++++++------- charts/incubator/firefox/questions.yaml | 42 ++++++++++--------- charts/incubator/firefox/templates/NOTES.txt | 1 + .../incubator/firefox/templates/common.yaml | 2 +- charts/incubator/firefox/values.yaml | 39 ++++++++++++----- 5 files changed, 67 insertions(+), 47 deletions(-) create mode 100644 charts/incubator/firefox/templates/NOTES.txt diff --git a/charts/incubator/firefox/Chart.yaml b/charts/incubator/firefox/Chart.yaml index b03a459c6e0..3dcbfa5cd19 100644 --- a/charts/incubator/firefox/Chart.yaml +++ b/charts/incubator/firefox/Chart.yaml @@ -1,28 +1,28 @@ apiVersion: v2 -kubeVersion: ">=1.16.0-0" -name: firefox -version: 5.0.0 -appVersion: "101.0.1" -description: Firefox Browser, also known as Mozilla Firefox or simply Firefox, -type: application +appVersion: "109.0.1" +dependencies: + - name: common + repository: https://library-charts.truecharts.org + version: 12.10.4 deprecated: false +description: a free and open-source web browser developed by the Mozilla Foundation and its subsidiary, the Mozilla Corporation. home: https://truecharts.org/charts/incubator/firefox icon: https://truecharts.org/img/hotlink-ok/chart-icons/firefox.png keywords: - firefox -sources: - - https://github.com/truecharts/charts/tree/master/charts/incubator/firefox -dependencies: - - name: common - repository: https://library-charts.truecharts.org - version: 11.1.2 - # condition: + - browser +kubeVersion: ">=1.16.0-0" maintainers: - email: info@truecharts.org name: TrueCharts url: https://truecharts.org +name: firefox +sources: + - https://github.com/truecharts/charts/tree/master/charts/incubator/firefox + - https://github.com/linuxserver/docker-firefox +type: application +version: 6.0.0 annotations: truecharts.org/catagories: | - - incubator + - browser truecharts.org/SCALE-support: "true" - truecharts.org/grade: U diff --git a/charts/incubator/firefox/questions.yaml b/charts/incubator/firefox/questions.yaml index 319be7a23d4..d48652b4b85 100644 --- a/charts/incubator/firefox/questions.yaml +++ b/charts/incubator/firefox/questions.yaml @@ -10,14 +10,28 @@ questions: # Include{replicas1} # Include{podSpec} # Include{containerMain} + + - variable: env + label: Image Environment + schema: + additional_attrs: true + type: dict + attrs: + - variable: TITLE + label: Title + description: The page title displayed on the web browser + schema: + type: string + default: "TrueChartVNC Client" + # 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" + label: Main Service + description: The Primary service on which the Minecraft Server runs on schema: additional_attrs: true type: dict @@ -25,14 +39,14 @@ questions: # 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: 10131 @@ -42,28 +56,16 @@ questions: # Include{serviceList} # Include{persistenceRoot} - variable: config - label: "App Config Storage" - description: "Stores the Application Configuration." + label: App Config Storage + description: Stores the Application Config. 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{ingressAdvanced} -# Include{ingressList} -# Include{securityContextRoot} +# Include{securityContextRoot} - variable: runAsUser label: "runAsUser" description: "The UserID of the user running the application" diff --git a/charts/incubator/firefox/templates/NOTES.txt b/charts/incubator/firefox/templates/NOTES.txt new file mode 100644 index 00000000000..efcb74cb772 --- /dev/null +++ b/charts/incubator/firefox/templates/NOTES.txt @@ -0,0 +1 @@ +{{- include "tc.v1.common.lib.chart.notes" $ -}} diff --git a/charts/incubator/firefox/templates/common.yaml b/charts/incubator/firefox/templates/common.yaml index c1a366e1cf0..b51394e00a4 100644 --- a/charts/incubator/firefox/templates/common.yaml +++ b/charts/incubator/firefox/templates/common.yaml @@ -1 +1 @@ -{{ include "tc.common.loader.all" . }} +{{ include "tc.v1.common.loader.all" . }} diff --git a/charts/incubator/firefox/values.yaml b/charts/incubator/firefox/values.yaml index c8799ab3c57..b1a57fbb364 100644 --- a/charts/incubator/firefox/values.yaml +++ b/charts/incubator/firefox/values.yaml @@ -1,29 +1,46 @@ image: repository: tccr.io/truecharts/firefox pullPolicy: IfNotPresent - tag: 101.0.1@sha256:ed6178aa78fa1d11cad7c86d6554b3d9e903a82aec65ab6d7fb8ea77aeb6810b + tag: v109.0.1@sha256:0d5c436afbd776aab406ec12ff2230fa45b4aaba31f75735cca0cde4254fc7ec securityContext: - runAsNonRoot: false - readOnlyRootFilesystem: false - -podSecurityContext: - runAsUser: 0 - runAsGroup: 0 + container: + readOnlyRootFilesystem: false + runAsNonRoot: false + runAsUser: 0 + runAsGroup: 0 service: main: ports: main: - targetPort: 3000 + protocol: http port: 10131 +workload: + main: + podSpec: + containers: + main: + probes: + liveness: + type: http + readiness: + type: http + startup: + type: http + env: + FM_HOME: "/config" + CUSTOM_PORT: "{{ .Values.service.main.ports.main.port }}" + TITLE: "TrueChartVNC Client" + persistence: config: enabled: true - mountPath: "/config" + mountPath: /config varrun: - enabled: true + enabled: false portal: - enabled: true + open: + enabled: true