From 6cd81ed25f5e37153b341640f2dee6c19f671cd8 Mon Sep 17 00:00:00 2001 From: nautilus7 <1540233+nautilus7@users.noreply.github.com> Date: Fri, 16 Jun 2023 12:26:26 +0300 Subject: [PATCH] fix(frigate) map container ports for rtsp and webrtc services (#9598) 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 - [ ] ⚠️ 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 - [ ] 👀 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 - [x] ⚠️ 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/frigate/Chart.yaml | 2 +- charts/incubator/frigate/questions.yaml | 59 ++++++++++++++++++++++++- charts/incubator/frigate/values.yaml | 23 ++++++++-- 3 files changed, 77 insertions(+), 7 deletions(-) diff --git a/charts/incubator/frigate/Chart.yaml b/charts/incubator/frigate/Chart.yaml index 0639a6b75a7..7951104851a 100644 --- a/charts/incubator/frigate/Chart.yaml +++ b/charts/incubator/frigate/Chart.yaml @@ -23,7 +23,7 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/incubator/frigate - https://github.com/blakeblackshear/frigate type: application -version: 9.0.2 +version: 9.0.3 annotations: truecharts.org/catagories: | - nvr diff --git a/charts/incubator/frigate/questions.yaml b/charts/incubator/frigate/questions.yaml index f26bdf4ef04..0ebf7906f2e 100644 --- a/charts/incubator/frigate/questions.yaml +++ b/charts/incubator/frigate/questions.yaml @@ -29,7 +29,6 @@ questions: schema: type: int default: 10500 - editable: true required: true - variable: rtmp label: RTMP Service @@ -52,7 +51,63 @@ questions: schema: type: int default: 1935 - editable: true + required: true + - variable: rtsp + label: RTSP Service + description: The service on which nodes connect to. + schema: + additional_attrs: true + type: dict + attrs: +# Include{serviceSelectorLoadBalancer} +# Include{serviceSelectorExtras} + - variable: rtsp + label: RTSP Service Port Configuration + schema: + additional_attrs: true + type: dict + attrs: + - variable: port + label: Port + description: This port exposes the container port on the service + schema: + type: int + default: 8554 + required: true + - variable: webrtc + label: WebRTC Service + description: The service on which nodes connect to. + schema: + additional_attrs: true + type: dict + attrs: +# Include{serviceSelectorLoadBalancer} +# Include{serviceSelectorExtras} + - variable: webrtc-tcp + label: WebRTC (TCP) Service Port Configuration + schema: + additional_attrs: true + type: dict + attrs: + - variable: port + label: Port + description: This port exposes the container port on the service + schema: + type: int + default: 8555 + required: true + - variable: webrtc-udp + label: WebRTC (UDP) Service Port Configuration + schema: + additional_attrs: true + type: dict + attrs: + - variable: port + label: Port + description: This port exposes the container port on the service + schema: + type: int + default: 8555 required: true # Include{serviceExpertRoot} # Include{serviceExpert} diff --git a/charts/incubator/frigate/values.yaml b/charts/incubator/frigate/values.yaml index 6b31a3345b0..cca98a78424 100644 --- a/charts/incubator/frigate/values.yaml +++ b/charts/incubator/frigate/values.yaml @@ -44,10 +44,6 @@ securityContext: runAsUser: 0 runAsGroup: 0 -ingress: - rtmp: - autoLink: true - service: main: ports: @@ -62,6 +58,25 @@ service: enabled: true port: 1935 targetPort: 1935 + rtsp: + enabled: true + ports: + rtsp: + enabled: true + port: 8554 + targetPort: 8554 + webrtc: + enabled: true + ports: + webrtc-tcp: + enabled: true + port: 8555 + targetPort: 8555 + webrtc-udp: + enabled: true + port: 8555 + protocol: udp + targetPort: 8555 persistence: media: