diff --git a/charts/stable/frigate/Chart.yaml b/charts/stable/frigate/Chart.yaml index 4de0e0f7..47e7e414 100644 --- a/charts/stable/frigate/Chart.yaml +++ b/charts/stable/frigate/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: v0.9.4 +appVersion: 0.10.0-amd64 description: NVR With Realtime Object Detection for IP Cameras name: frigate -version: 7.1.0 +version: 8.0.0 kubeVersion: ">=1.16.0-0" keywords: - frigate @@ -27,4 +27,9 @@ dependencies: annotations: artifacthub.io/changes: | - kind: changed - description: Upgraded `common` chart dependency to version `4.3.0`. + description: **Breaking:** Updated image tag to version `0.10.0-amd64`. See the application release notes for the breaking changes. + links: + - name: Application release notes + url: https://github.com/blakeblackshear/frigate/releases/tag/v0.10.0 + - kind: changed + description: **Breaking:** Use the common library built-in configMap for configuration. diff --git a/charts/stable/frigate/ci/ct-values.yaml b/charts/stable/frigate/ci/ct-values.yaml index 13efc25c..8b6c79a5 100644 --- a/charts/stable/frigate/ci/ct-values.yaml +++ b/charts/stable/frigate/ci/ct-values.yaml @@ -3,30 +3,24 @@ persistence: enabled: true type: emptyDir mountPath: /data -config: | - detectors: - cpu1: - type: cpu - num_threads: 1 - mqtt: - host: 192.168.1.2 - client_id: frigate - user: frigate - password: frigate - database: - path: /data/frigate.db - detect: - fps: 4 - height: 360 - width: 640 - cameras: - camera_1: - ffmpeg: - inputs: - - path: rtsp://admin:admin@192.168.1.3:5554//h264Preview_01_sub - roles: - - detect - - rtmp - zones: - door: - coordinates: 481,42,596,48,565,267,469,228 + +configmap: + config: + enabled: true + data: + config.yml: | + database: + path: /data/frigate.db + mqtt: + host: test.mosquitto.org + cameras: + back: + ffmpeg: + inputs: + - path: rtsp://10.0.10.10:554/rtsp + roles: + - detect + - rtmp + detect: + width: 1280 + height: 720 diff --git a/charts/stable/frigate/templates/common.yaml b/charts/stable/frigate/templates/common.yaml index 40fe6cc7..4d4a2745 100644 --- a/charts/stable/frigate/templates/common.yaml +++ b/charts/stable/frigate/templates/common.yaml @@ -2,18 +2,23 @@ {{- include "common.values.setup" . }} {{/* Append the hardcoded settings */}} -{{- define "frigate.configValues" -}} -persistence: - frigate-config: - enabled: "true" - mountPath: "/config/config.yml" - subPath: "config.yml" - type: "custom" - volumeSpec: - configMap: - name: {{ printf "%v-config" (include "common.names.fullname" .) }} +{{- define "frigate.harcodedValues" -}} + {{- if .Values.configmap.config.enabled }} + {{/* merge frigate specific annotations with podAnnotations*/}} + podAnnotations: + configmap/checksum: "{{ .Values.configmap.config.data | toYaml | sha256sum }}" + + {{/* Append the configMap volume to the volumes */}} + persistence: + config: + enabled: true + type: "configMap" + name: "{{ printf "%v-config" (include "common.names.fullname" .) }}" + mountPath: "/config/config.yml" + subPath: "config.yml" + {{- end }} {{- end -}} -{{- $_ := mergeOverwrite .Values (include "frigate.configValues" . | fromYaml) -}} +{{- $_ := mergeOverwrite .Values (include "frigate.harcodedValues" . | fromYaml) -}} {{/* Render the templates */}} {{ include "common.all" . }} diff --git a/charts/stable/frigate/templates/configmap.yaml b/charts/stable/frigate/templates/configmap.yaml deleted file mode 100644 index ed62941d..00000000 --- a/charts/stable/frigate/templates/configmap.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.names.fullname" . }}-config - labels: - {{- include "common.labels" . | nindent 4 }} -data: - config.yml: | - {{- tpl .Values.config $ | nindent 4 }} diff --git a/charts/stable/frigate/values.yaml b/charts/stable/frigate/values.yaml index ddd64c9a..1785a84c 100644 --- a/charts/stable/frigate/values.yaml +++ b/charts/stable/frigate/values.yaml @@ -9,7 +9,8 @@ image: # -- image repository repository: blakeblackshear/frigate # -- image tag - tag: 0.9.4-amd64 + # @default -- chart.appVersion + tag: # -- image pull policy pullPolicy: IfNotPresent @@ -95,14 +96,25 @@ resources: {} # gpu.intel.com/i915: 1 # memory: 4096Mi -# -- See [docs](https://blakeblackshear.github.io/frigate/) for more details. -# @default -- see URL to default config -config: | - mqtt: - host: test.mosquitto.org - topic_prefix: frigate - database: - path: /data/frigate.db - detectors: - cpu1: - type: cpu +configmap: + config: + # -- Store frigate configuration as a ConfigMap + enabled: true + + # -- See [docs](https://blakeblackshear.github.io/frigate/) for more details. + # @default -- see URL to default config + data: + config.yml: | + mqtt: + host: mqtt.server.com + cameras: + back: + ffmpeg: + inputs: + - path: rtsp://demo:demo@ipvmdemo.dyndns.org:5541/onvif-media/media.amp?profile=profile_1_h264&sessiontimeout=60&streamtype=unicast + roles: + - detect + - rtmp + detect: + width: 1280 + height: 720