Merge branch 'blakeblackshear:master' into webrtc-ports

Author: LiquidPL

charts/frigate/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "0.14.0"
+appVersion: "0.14.1"
 description: NVR With Realtime Object Detection for IP Cameras
 name: frigate
-version: 7.6.0
+version: 7.7.0
 keywords:
   - tensorflow
   - coral

charts/frigate/README.md

@@ -42,6 +42,19 @@ config: |
               - detect
 ```
 
+#### Configuration Updates
+
+Since the config key is stored in a configMap which is mounted as a read-only file, the Frigate UI
+will be unable to update the configuration, and config migration will fail.
+
+If `persistence.config.ephemeralWritableConfigYaml` is set to true along with `persistence.config.enabled`,
+the config.yml will be copied into the /config volume mount rather than mounted into it.
+
+Copying the config file means migrations can run, and updates to settings, zones, etc.. will be
+written to the running configuration. **However** as soon as the pod is restarted, the changes
+will be lost, so you will have to retrieve the config.yml either from the pod, or
+by performing a `GET /api/config` and updating your helm values `config` key with the new yaml.
+
 #### Install Chart
 
 Now install the chart:
@@ -93,6 +106,7 @@ helm upgrade --install \
 | persistence.config.size | string | `"10Gi"` | size/capacity of the PVC |
 | persistence.config.skipuninstall | bool | `false` | Do not delete the pvc upon helm uninstall |
 | persistence.config.accessMode | string | `"ReadWriteOnce"` | [access mode](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#access-modes) to use for the PVC |
+| persistence.config.ephemeralWritableConfigYaml | bool | `true` | Copy config into volume mount for writable ephemeral config support |
 | persistence.media.enabled | bool | `false` | Enables persistence for the data directory |
 | persistence.media.size | string | `"10Gi"` | size/capacity of the PVC |
 | persistence.media.skipuninstall | bool | `false` | Do not delete the pvc upon helm uninstall |
@@ -118,4 +132,4 @@ helm upgrade --install \
 | service.type | string | `"ClusterIP"` | Type of Service to use |
 | shmSize | string | `"1Gi"` | amount of shared memory to use for caching |
 | strategyType | string | `"Recreate"` | upgrade strategy type (e.g. Recreate or RollingUpdate) |
-| tolerations | list | `[]` | Node toleration configuration |
+| tolerations | list | `[]` | Node toleration configuration |

charts/frigate/templates/deployment.yaml

@@ -32,6 +32,25 @@ spec:
     {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
+    {{- end }}
+    {{- if or .Values.extraInitContainers (and .Values.persistence.config.enabled .Values.persistence.config.ephemeralWritableConfigYaml) }}
+      initContainers:
+      {{- with .Values.extraInitContainers }}
+        {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{- if and .Values.persistence.config.enabled .Values.persistence.config.ephemeralWritableConfigYaml }}
+        - name: copyconfig
+          image: "{{ .Values.image.repository }}:{{ include "frigate.imageTag" . }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          volumeMounts:
+            - mountPath: /config.yml
+              subPath: config.yml
+              name: configmap
+            - mountPath: /config
+              name: config
+          command: [ "cp" ]
+          args: [ "-v", "/config.yml", "/config/config.yaml" ]
+      {{- end }}
     {{- end }}
       containers:
         - name: {{ .Chart.Name }}
@@ -47,7 +66,7 @@ spec:
             - name: http
               containerPort: 5000
               protocol: TCP
-            - name: http-auth 
+            - name: http-auth
               containerPort: 8971
               protocol: TCP
             - name: rtmp
@@ -112,9 +131,11 @@ spec:
             - mountPath: {{ .Values.coral.hostPath }}
               name: coral-dev
             {{- end }}
+            {{- if not (and .Values.persistence.config.enabled .Values.persistence.config.ephemeralWritableConfigYaml) }}
             - mountPath: /config/config.yml
               subPath: config.yml
               name: configmap
+            {{- end }}
             - mountPath: /config
               name: config
             - mountPath: /data

charts/frigate/values.yaml

@@ -162,7 +162,7 @@ ingress:
     # nginx.org/websocket-services: "<release_name>-frigate" # TODO: can this be automated?
 
   # -- list of hosts and their paths and ports that ingress controller should repsond to.
-  # -- alternatively use `http` if anonymous auth is allowed 
+  # -- alternatively use `http` if anonymous auth is allowed
   hosts:
     - host: chart.example.local
       paths:
@@ -209,6 +209,12 @@ persistence:
     # -- Do not delete the pvc upon helm uninstall
     skipuninstall: false
 
+    ## Copy configMap config into volume to make writable
+    ## All live changes are lost when pod restarts, but this allows
+    ## an easy way to run migrations and edit config, then scrape
+    ## it from the API or copy out of the pod and update local helm values
+    ephemeralWritableConfigYaml: true
+
   media:
     # -- Enables persistence for the media directory
     enabled: false
@@ -267,3 +273,6 @@ affinity: {}
 
 # -- Set additonal pod Annotations
 podAnnotations: {}
+
+# -- Define extra init containers
+extraInitContainers: []