From 2142d176aab92e568a446bd4599a37e845bc5e2b Mon Sep 17 00:00:00 2001 From: Alec Fenichel Date: Mon, 15 May 2023 04:03:10 -0400 Subject: [PATCH] feat(channels-dvr): Port to new common (#8924) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** Updates channels-dvr to new common. ⚒️ Fixes # **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [ ] 🪛 Bugfix - [X] ⚠️ 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:** - [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._ --- charts/incubator/channels-dvr/Chart.yaml | 5 +- charts/incubator/channels-dvr/questions.yaml | 79 +++++++++---------- .../channels-dvr/templates/NOTES.txt | 1 + .../channels-dvr/templates/common.yaml | 2 +- charts/incubator/channels-dvr/values.yaml | 24 +++++- 5 files changed, 61 insertions(+), 50 deletions(-) create mode 100644 charts/incubator/channels-dvr/templates/NOTES.txt diff --git a/charts/incubator/channels-dvr/Chart.yaml b/charts/incubator/channels-dvr/Chart.yaml index 250c56654c5..5c602b89b51 100644 --- a/charts/incubator/channels-dvr/Chart.yaml +++ b/charts/incubator/channels-dvr/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 11.1.2 + version: 12.6.6 deprecated: false description: Channels DVR Server home: https://truecharts.org/charts/incubator/channels-dvr @@ -19,9 +19,8 @@ name: channels-dvr sources: - https://github.com/truecharts/charts/tree/master/charts/incubator/channels-dvr type: application -version: 0.0.11 +version: 1.0.0 annotations: truecharts.org/catagories: | - media truecharts.org/SCALE-support: "true" - truecharts.org/grade: U diff --git a/charts/incubator/channels-dvr/questions.yaml b/charts/incubator/channels-dvr/questions.yaml index 23fb6dfb157..e3eed148f3e 100644 --- a/charts/incubator/channels-dvr/questions.yaml +++ b/charts/incubator/channels-dvr/questions.yaml @@ -4,46 +4,41 @@ portals: # Include{portalLink} questions: # Include{global} - - variable: imageSelector - group: Container Image - label: Select Image - schema: - type: string - default: image - enum: - - value: image - description: Channels DVR - - value: tveImage - description: Channels DVR with TV Everywhere # Include{workload} # Include{workloadDeployment} # Include{replicas1} # Include{podSpec} # Include{containerMain} + - variable: imageSelector + group: Container Image + label: Select Image + schema: + type: string + default: image + enum: + - value: image + description: Channels DVR + - value: tveImage + description: Channels DVR with TV Everywhere + # 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: 8089 @@ -54,8 +49,8 @@ questions: # Include{serviceList} # Include{persistenceRoot} - variable: config - label: App Config Storage - description: Stores the Application Configuration. + label: "App Config Storage" + description: "Stores the Application Configuration." schema: additional_attrs: true type: dict @@ -64,7 +59,7 @@ questions: # Include{persistenceList} # Include{ingressRoot} - variable: main - label: Main Ingress + label: "Main Ingress" schema: additional_attrs: true type: dict @@ -75,27 +70,27 @@ questions: # Include{ingressList} # 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 this App 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/channels-dvr/templates/NOTES.txt b/charts/incubator/channels-dvr/templates/NOTES.txt new file mode 100644 index 00000000000..efcb74cb772 --- /dev/null +++ b/charts/incubator/channels-dvr/templates/NOTES.txt @@ -0,0 +1 @@ +{{- include "tc.v1.common.lib.chart.notes" $ -}} diff --git a/charts/incubator/channels-dvr/templates/common.yaml b/charts/incubator/channels-dvr/templates/common.yaml index c1a366e1cf0..b51394e00a4 100644 --- a/charts/incubator/channels-dvr/templates/common.yaml +++ b/charts/incubator/channels-dvr/templates/common.yaml @@ -1 +1 @@ -{{ include "tc.common.loader.all" . }} +{{ include "tc.v1.common.loader.all" . }} diff --git a/charts/incubator/channels-dvr/values.yaml b/charts/incubator/channels-dvr/values.yaml index dabf619ea8f..912b53db166 100644 --- a/charts/incubator/channels-dvr/values.yaml +++ b/charts/incubator/channels-dvr/values.yaml @@ -8,14 +8,12 @@ tveImage: pullPolicy: Always tag: latest@sha256:7e0130ad244e07f3714edadecdcc8711d9d3c11eac8409705b5c6aa8e108ca7e -imageSelector: image - service: main: ports: main: port: 8089 - protocol: HTTP + protocol: http targetPort: 8089 persistence: @@ -24,4 +22,22 @@ persistence: mountPath: /channels-dvr portal: - enabled: true + open: + enabled: true + +workload: + main: + podSpec: + containers: + main: + imageSelector: image + probes: + liveness: + port: 8089 + scheme: http + readiness: + port: 8089 + scheme: http + startup: + port: 8089 + scheme: http