From ac527c481064e7c526d9527544cecaa8a57f047c Mon Sep 17 00:00:00 2001 From: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com> Date: Thu, 1 Jun 2023 16:55:38 -0400 Subject: [PATCH] migrate(rickroll) migrate rickroll to new common. (#9317) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** ⚒️ Fixes # **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [ ] 🪛 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 - [X] 🧪 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._ --- charts/incubator/rickroll/Chart.yaml | 14 ++-- .../incubator/rickroll/ci/basic-values.yaml | 0 charts/incubator/rickroll/ci/fhd-values.yaml | 1 - .../incubator/rickroll/ci/fhdgame-values.yaml | 1 - .../rickroll/ci/fhdonclick-values.yaml | 1 - .../incubator/rickroll/ci/onclick-values.yaml | 1 - charts/incubator/rickroll/questions.yaml | 84 ++++++++++--------- .../incubator/rickroll/templates/common.yaml | 3 +- charts/incubator/rickroll/values.yaml | 56 ++++++------- 9 files changed, 82 insertions(+), 79 deletions(-) delete mode 100644 charts/incubator/rickroll/ci/basic-values.yaml delete mode 100644 charts/incubator/rickroll/ci/fhd-values.yaml delete mode 100644 charts/incubator/rickroll/ci/fhdgame-values.yaml delete mode 100644 charts/incubator/rickroll/ci/fhdonclick-values.yaml delete mode 100644 charts/incubator/rickroll/ci/onclick-values.yaml diff --git a/charts/incubator/rickroll/Chart.yaml b/charts/incubator/rickroll/Chart.yaml index 2f36e39cce1..2b79b0a063a 100644 --- a/charts/incubator/rickroll/Chart.yaml +++ b/charts/incubator/rickroll/Chart.yaml @@ -1,15 +1,11 @@ -annotations: - truecharts.org/SCALE-support: "true" - truecharts.org/catagories: | - - Other apiVersion: v2 appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 11.1.2 + version: 12.10.4 deprecated: false -description: Self-hosted Rickrolls. Image is based on Nginx stable alpine, and all the content is local to the Chart. +description: Self-hosted Rick Roll chart. home: https://truecharts.org/charts/incubator/rickroll icon: https://truecharts.org/img/hotlink-ok/chart-icons/rickroll.png keywords: @@ -25,4 +21,8 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/incubator/rickroll - https://github.com/modem7/docker-rickroll type: application -version: 2.0.12 +version: 3.0.0 +annotations: + truecharts.org/catagories: | + - Other + truecharts.org/SCALE-support: "true" diff --git a/charts/incubator/rickroll/ci/basic-values.yaml b/charts/incubator/rickroll/ci/basic-values.yaml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/charts/incubator/rickroll/ci/fhd-values.yaml b/charts/incubator/rickroll/ci/fhd-values.yaml deleted file mode 100644 index 7d974674dd4..00000000000 --- a/charts/incubator/rickroll/ci/fhd-values.yaml +++ /dev/null @@ -1 +0,0 @@ -imageSelector: "imagefhd" diff --git a/charts/incubator/rickroll/ci/fhdgame-values.yaml b/charts/incubator/rickroll/ci/fhdgame-values.yaml deleted file mode 100644 index 965675f5f6a..00000000000 --- a/charts/incubator/rickroll/ci/fhdgame-values.yaml +++ /dev/null @@ -1 +0,0 @@ -imageSelector: "imagefhdgame" diff --git a/charts/incubator/rickroll/ci/fhdonclick-values.yaml b/charts/incubator/rickroll/ci/fhdonclick-values.yaml deleted file mode 100644 index ba25718dd39..00000000000 --- a/charts/incubator/rickroll/ci/fhdonclick-values.yaml +++ /dev/null @@ -1 +0,0 @@ -imageSelector: "imagefhdonclick" diff --git a/charts/incubator/rickroll/ci/onclick-values.yaml b/charts/incubator/rickroll/ci/onclick-values.yaml deleted file mode 100644 index 70310f903e2..00000000000 --- a/charts/incubator/rickroll/ci/onclick-values.yaml +++ /dev/null @@ -1 +0,0 @@ -imageSelector: "imageonclick" diff --git a/charts/incubator/rickroll/questions.yaml b/charts/incubator/rickroll/questions.yaml index 9ca5ef86652..a6c3332e944 100644 --- a/charts/incubator/rickroll/questions.yaml +++ b/charts/incubator/rickroll/questions.yaml @@ -4,52 +4,60 @@ portals: # Include{portalLink} questions: # Include{global} - - variable: imageSelector - group: "Container Image" - label: "Select Image" - schema: - type: string - default: "image" - enum: - - value: "image" - description: "Auto starts, but muted | SD quality" - - value: "fhdImage" - description: "Auto starts, but muted | 1080p quality" - - value: "fhdgameImage" - description: "Lost the game onClick | 1080p quality" - - value: "fhdonclickImage" - description: "Uses an onClick method with a poster image | 1080p quality" - - value: "fhdonclickImage" - description: "Uses an onClick method with a poster image | SD quality" # Include{workload} # Include{workloadDeployment} # Include{replicas1} # Include{podSpec} # Include{containerMain} + - variable: env + label: Image Environment + schema: + additional_attrs: true + type: dict + attrs: + - variable: TITLE + label: Title + description: Changes the title of the webpage. + schema: + type: string + default: "" + - variable: HEIGHT + label: Height + description: Changes the height of the video. + schema: + type: string + default: "100vh" + - variable: WIDTH + label: Width + description: Changes the width of the video. + schema: + type: string + default: "100%" + - variable: HEADLINE + label: HeadLine + description: Allows for a custom body tag. + schema: + type: string + default: "" + # Include{containerBasic} # Include{containerAdvanced} # Include{containerConfig} # 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 - 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: 10289 @@ -60,7 +68,7 @@ questions: # Include{persistenceList} # Include{ingressRoot} - variable: main - label: "Main Ingress" + label: Main Ingress schema: additional_attrs: true type: dict @@ -73,23 +81,23 @@ questions: # Include{securityContextRoot} - variable: runAsUser - label: "runAsUser" - description: "The UserID of the user running the application" + 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 - - 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." + label: fsGroup + description: The group that should own ALL storage. schema: type: int default: 568 diff --git a/charts/incubator/rickroll/templates/common.yaml b/charts/incubator/rickroll/templates/common.yaml index cbf66c20818..b51394e00a4 100644 --- a/charts/incubator/rickroll/templates/common.yaml +++ b/charts/incubator/rickroll/templates/common.yaml @@ -1,2 +1 @@ -{{/* Render the templates */}} -{{ include "tc.common.loader.all" . }} +{{ include "tc.v1.common.loader.all" . }} diff --git a/charts/incubator/rickroll/values.yaml b/charts/incubator/rickroll/values.yaml index 4775176d0ef..cf9e7e604f3 100644 --- a/charts/incubator/rickroll/values.yaml +++ b/charts/incubator/rickroll/values.yaml @@ -1,41 +1,41 @@ image: repository: tccr.io/truecharts/rickroll pullPolicy: IfNotPresent - tag: latest@sha256:7e44d66152b7a24d0ff41480992dcfbe24ae320c0d1bbed364726af86b26152e -fhdImage: - repository: tccr.io/truecharts/rickroll-fhd - pullPolicy: IfNotPresent - tag: latest@sha256:bc833e52ed8bb0e0abbd110c2afbb94a8ac794f8d5c758ad9ba992f2f75b1e14 -fhdgameImage: - repository: tccr.io/truecharts/rickroll-fhd-game - pullPolicy: IfNotPresent - tag: latest@sha256:ab13300ce0913219cd2f5bf4a390901185c4e51411e1be9fb25280c028f7af25 -fhdonclickImage: - repository: tccr.io/truecharts/rickroll-fhd-onclick - pullPolicy: IfNotPresent - tag: latest@sha256:a55428843ae3de037b1b346b1200eb6bc58fb661acc970e8dbffe7a255a45048 -onclickImage: - repository: tccr.io/truecharts/rickroll-onclick - pullPolicy: IfNotPresent - tag: latest@sha256:c01c92f2acf2a939802ea76732f931f2f07705a282422ba43fb3db2f96293cd5 - -imageSelector: "image" + tag: vlatest@sha256:0a74da4a4f146236124e2e1826d96e2ea6a3422401cf10da2152011c6832e634 securityContext: - readOnlyRootFilesystem: false - runAsNonRoot: false - -podSecurityContext: - runAsGroup: 0 - runAsUser: 0 + container: + readOnlyRootFilesystem: false + runAsNonRoot: false + runAsUser: 0 + runAsGroup: 0 service: main: ports: main: - protocol: HTTP - targetPort: 8080 + protocol: http port: 10289 +workload: + main: + podSpec: + containers: + main: + probes: + liveness: + type: http + readiness: + type: http + startup: + type: http + env: + PORT: "{{ .Values.service.main.ports.main.port }}" + TITLE: "Rickroll" + HEIGHT: "100vh" + WIDTH: "100%" + HEADLINE: "" + portal: - enabled: true + open: + enabled: true