From 6a1026983c31c2a54a894c53c9bf74f69c130161 Mon Sep 17 00:00:00 2001 From: mgale456 <55673155+mgale456@users.noreply.github.com> Date: Tue, 22 Nov 2022 01:07:22 -0600 Subject: [PATCH] fix(frigate): fix detectors question list (#4705) * add dict under list for detectors Signed-off-by: mgale456 <55673155+mgale456@users.noreply.github.com> * fix typo. change enabled to render_config Signed-off-by: mgale456 <55673155+mgale456@users.noreply.github.com> * bump version Signed-off-by: mgale456 <55673155+mgale456@users.noreply.github.com> Signed-off-by: mgale456 <55673155+mgale456@users.noreply.github.com> --- charts/incubator/frigate/Chart.yaml | 2 +- charts/incubator/frigate/questions.yaml | 68 ++++++++++--------- .../frigate/templates/_configmap.tpl | 2 +- 3 files changed, 39 insertions(+), 33 deletions(-) diff --git a/charts/incubator/frigate/Chart.yaml b/charts/incubator/frigate/Chart.yaml index 427072a5872..78e96ffca64 100644 --- a/charts/incubator/frigate/Chart.yaml +++ b/charts/incubator/frigate/Chart.yaml @@ -24,7 +24,7 @@ sources: - https://github.com/blakeblackshear/frigate - https://hub.docker.com/r/blakeblackshear/frigate type: application -version: 5.0.4 +version: 5.0.5 annotations: truecharts.org/catagories: | - nvr diff --git a/charts/incubator/frigate/questions.yaml b/charts/incubator/frigate/questions.yaml index f21c1cb294f..40e440b95c0 100644 --- a/charts/incubator/frigate/questions.yaml +++ b/charts/incubator/frigate/questions.yaml @@ -85,38 +85,44 @@ questions: type: list default: [] items: - - variable: name - label: Name - description: Name of the detector + - variable: detector_entry + label: Detector Entry schema: - type: string - required: true - default: "" - - variable: type - label: Type - description: Name of the detector - schema: - type: string - required: true - default: cpu - enum: - - value: cpu - description: CPU - - value: edgetpu - description: Edge TPU - - variable: device - label: Device - description: Device name as defined here - https://coral.ai/docs/edgetpu/multiple-edgetpu/#using-the-tensorflow-lite-python-api - schema: - type: string - default: "" - - variable: num_threads - label: Number of Threads - description: This value is only used for CPU types - schema: - type: int - show_if: [["type", "=", "cpu"]] - default: 3 + additional_attrs: true + type: dict + attrs: + - variable: name + label: Name + description: Name of the detector + schema: + type: string + required: true + default: "" + - variable: type + label: Type + description: Name of the detector + schema: + type: string + required: true + default: cpu + enum: + - value: cpu + description: CPU + - value: edgetpu + description: Edge TPU + - variable: device + label: Device + description: Device name as defined here - https://coral.ai/docs/edgetpu/multiple-edgetpu/#using-the-tensorflow-lite-python-api + schema: + type: string + default: "" + - variable: num_threads + label: Number of Threads + description: This value is only used for CPU types + schema: + type: int + show_if: [["type", "=", "cpu"]] + default: 3 - variable: model label: Model schema: diff --git a/charts/incubator/frigate/templates/_configmap.tpl b/charts/incubator/frigate/templates/_configmap.tpl index 43fa35f08e0..17b97a97b15 100644 --- a/charts/incubator/frigate/templates/_configmap.tpl +++ b/charts/incubator/frigate/templates/_configmap.tpl @@ -28,7 +28,7 @@ data: password: {{ . }} {{- end }} - {{- if .Values.frigate.detectors.enabled }} + {{- if .Values.frigate.detectors.render_config }} {{- if .Values.frigate.detectors.config }} detectors: {{- range .Values.frigate.detectors.config }}