diff --git a/charts/stable/frigate/Chart.yaml b/charts/stable/frigate/Chart.yaml index 852bdd35b73..7f81f083198 100644 --- a/charts/stable/frigate/Chart.yaml +++ b/charts/stable/frigate/Chart.yaml @@ -36,4 +36,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/frigate - https://ghcr.io/blakeblackshear/frigate type: application -version: 14.0.0 +version: 14.0.1 diff --git a/charts/stable/frigate/templates/_configmap.tpl b/charts/stable/frigate/templates/_configmap.tpl index ebf25801a72..140aa24e075 100644 --- a/charts/stable/frigate/templates/_configmap.tpl +++ b/charts/stable/frigate/templates/_configmap.tpl @@ -2,11 +2,10 @@ {{- define "frigate.configmap" -}} enabled: true data: - {{- if .Values.frigateConfig }} config.yml: | + {{- if .Values.frigateConfig }} {{- .Values.frigateConfig | toYaml | nindent 4 }} {{- else }} - config.yml.dummy: | mqtt: enabled: false cameras: @@ -21,22 +20,24 @@ data: {{- end -}} {{- define "frigate.configVolume" -}} +{{- $mountPath := "/dummy-config/config.yml" -}} +{{- if .Values.frigateConfig }} + {{- $mountPath = "/config/config.yaml" -}} +{{- end }} enabled: true type: configmap objectName: frigate-config -targetSelector: - main: - main: {} - init-config: {} -{{- if .Values.frigateConfig }} -mountPath: /config items: - key: config.yml path: config.yml -{{- else }} -mountPath: /dummy-config -items: - - key: config.yml.dummy - path: config.yml.dummy -{{- end -}} +targetSelector: + main: + main: + subPath: config.yml + mountPath: {{ $mountPath }} + readOnly: true + init-config: + subPath: config.yml + mountPath: {{ $mountPath }} + readOnly: true {{- end -}} diff --git a/charts/stable/frigate/templates/common.yaml b/charts/stable/frigate/templates/common.yaml index 38e70f42807..2b554743aec 100644 --- a/charts/stable/frigate/templates/common.yaml +++ b/charts/stable/frigate/templates/common.yaml @@ -7,11 +7,6 @@ {{- $_ := set .Values.configmap "frigate-config" $config -}} {{- end -}} -{{- if .Values.frigateConfig -}} - {{- $_ := set .Values.persistence.modelcache "enabled" true -}} -{{- else }} - {{- $_ := set .Values.persistence.config "enabled" true -}} -{{- end -}} {{- $vol := include "frigate.configVolume" . | fromYaml -}} {{- if $vol -}} diff --git a/charts/stable/frigate/values.yaml b/charts/stable/frigate/values.yaml index 5baeac9c95e..77609964697 100644 --- a/charts/stable/frigate/values.yaml +++ b/charts/stable/frigate/values.yaml @@ -6,6 +6,7 @@ tensorrtImage: repository: ghcr.io/blakeblackshear/frigate pullPolicy: IfNotPresent tag: 0.13.2-tensorrt@sha256:07cc224cdf2feef0af9c860c044ac7ea0ac4adfca7f68b37dc3958bc3a3ee357 + # When this is defined, the contents will be mounted # as configmap into the container at /config/config.yml. frigateConfig: {} @@ -36,15 +37,19 @@ workload: mkdir -p /config if [ ! -f /config/config.yml ]; then echo "Config file not found, copying dummy..." - cp /dummy-config/config.yml.dummy /config/config.yml + cp /dummy-config/config.yml /config/config.yml echo "Config file copied, you can now edit it at /config/config.yml" + else + echo "Config file found, you can edit it at /config/config.yml" fi + securityContext: container: readOnlyRootFilesystem: false runAsNonRoot: false runAsUser: 0 runAsGroup: 0 + service: main: ports: @@ -78,24 +83,19 @@ service: port: 8555 protocol: udp targetPort: 8555 + persistence: media: enabled: true mountPath: /media config: - # Only enable when not using frigateConfig - enabled: false + enabled: true mountPath: /config targetSelector: main: main: {} init-config: {} - modelcache: - # Only enable when using frigateConfig - enabled: false - mountPath: /config/model_cache portal: open: enabled: true -updated: true