From f293089647f5ee0eb206dc96169a06de7693abf4 Mon Sep 17 00:00:00 2001 From: StevenMcElligott <89483932+StevenMcElligott@users.noreply.github.com> Date: Tue, 22 Aug 2023 02:50:45 -0400 Subject: [PATCH] migrate(obs-ndi-migration): Miigrate to new common (#11772) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** Let's see how this reacts ⚒️ 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._ --- charts/incubator/obs-ndi/Chart.yaml | 4 +- charts/incubator/obs-ndi/questions.yaml | 4 +- .../incubator/obs-ndi/templates/common.yaml | 2 +- charts/incubator/obs-ndi/values.yaml | 47 ++++++++++++++----- 4 files changed, 39 insertions(+), 18 deletions(-) diff --git a/charts/incubator/obs-ndi/Chart.yaml b/charts/incubator/obs-ndi/Chart.yaml index 9b07401c82e..a87209b580a 100644 --- a/charts/incubator/obs-ndi/Chart.yaml +++ b/charts/incubator/obs-ndi/Chart.yaml @@ -10,7 +10,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 11.1.2 + version: 14.0.1 deprecated: false description: "This container is based on bb12489/gui-Chart &amp;amp; bb12489/Chart-obs. The OBS with NDI is incorporated into the container and can be used to stream your desktop. The main reason for this fork is to update the Chart and add it to the TrueNAS app store.&#xD;" home: https://truecharts.org/charts/incubator/obs-ndi @@ -31,4 +31,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/incubator/obs-ndi - https://github.com/patrickstigler/docker-obs-ndi type: application -version: 2.0.15 +version: 3.0.0 diff --git a/charts/incubator/obs-ndi/questions.yaml b/charts/incubator/obs-ndi/questions.yaml index 3fda23be86f..1ac64acaa92 100644 --- a/charts/incubator/obs-ndi/questions.yaml +++ b/charts/incubator/obs-ndi/questions.yaml @@ -21,8 +21,8 @@ questions: type: dict attrs: - variable: VNC_PASSWD - label: "VNC_PASSWD" - description: "Container Variable VNCPASSWD" + label: "VNC Password to login" + description: "Enter your VNC password to login" schema: type: string default: "123456" diff --git a/charts/incubator/obs-ndi/templates/common.yaml b/charts/incubator/obs-ndi/templates/common.yaml index cbf66c20818..78d963fb168 100644 --- a/charts/incubator/obs-ndi/templates/common.yaml +++ b/charts/incubator/obs-ndi/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "tc.common.loader.all" . }} +{{ include "tc.v1.common.loader.all" . }} diff --git a/charts/incubator/obs-ndi/values.yaml b/charts/incubator/obs-ndi/values.yaml index a961ec3beb6..344bfef2854 100644 --- a/charts/incubator/obs-ndi/values.yaml +++ b/charts/incubator/obs-ndi/values.yaml @@ -1,26 +1,47 @@ -env: - VNC_PASSWD: "123456" image: pullPolicy: IfNotPresent repository: tccr.io/truecharts/obs-ndi tag: latest@sha256:321eb11d40c21fbf90a1eba09e88b9e641a9473cc5c689f289775080164be156 -persistence: - configpath: - enabled: true - mountPath: /config/obs-studio -podSecurityContext: - runAsGroup: 0 - runAsUser: 0 + securityContext: - readOnlyRootFilesystem: false - runAsNonRoot: false + container: + runAsGroup: 0 + runAsUser: 0 + readOnlyRootFilesystem: false + runAsNonRoot: false + +workload: + main: + podSpec: + containers: + main: + securityContext: + capabilities: + add: + - NET_BIND_SERVICE + - KILL + probes: + liveness: + type: tcp + readiness: + type: tcp + startup: + type: tcp + env: + VNC_PASSWD: "123456" service: main: ports: main: port: 5901 - protocol: TCP + protocol: http targetPort: 5901 +persistence: + configpath: + enabled: true + mountPath: /config/obs-studio + portal: - enabled: true + open: + enabled: true