From 064aa6e6e63ff85f0839b6211410bf381a4e0a11 Mon Sep 17 00:00:00 2001
From: brujoand <anders@brujordet.no>
Date: Thu, 22 Jul 2021 09:21:55 +0200
Subject: [PATCH] Revert "Rename the data pvc to media"

This reverts commit 7f8a44b2802fe2d8ac4972d93aa2b70c13b958fd.
---
 charts/frigate/templates/data-pvc.yaml   | 28 ++++++++++++++++++++++++
 charts/frigate/templates/deployment.yaml | 12 +++++++---
 charts/frigate/templates/media-pvc.yaml  | 28 ------------------------
 charts/frigate/values.yaml               |  4 ++--
 4 files changed, 39 insertions(+), 33 deletions(-)
 create mode 100644 charts/frigate/templates/data-pvc.yaml
 delete mode 100644 charts/frigate/templates/media-pvc.yaml

diff --git a/charts/frigate/templates/data-pvc.yaml b/charts/frigate/templates/data-pvc.yaml
new file mode 100644
index 0000000..ada2980
--- /dev/null
+++ b/charts/frigate/templates/data-pvc.yaml
@@ -0,0 +1,28 @@
+{{- if and .Values.persistence.data.enabled (not .Values.persistence.data.existingClaim) }}
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: {{ template "frigate.fullname" . }}-data
+  {{- if .Values.persistence.data.skipuninstall }}
+  annotations:
+    "helm.sh/resource-policy": keep
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ include "frigate.name" . }}
+    helm.sh/chart: {{ include "frigate.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+spec:
+  accessModes:
+    - {{ .Values.persistence.data.accessMode | quote }}
+  resources:
+    requests:
+      storage: {{ .Values.persistence.data.size | quote }}
+{{- if .Values.persistence.data.storageClass }}
+{{- if (eq "-" .Values.persistence.data.storageClass) }}
+  storageClassName: ""
+{{- else }}
+  storageClassName: "{{ .Values.persistence.data.storageClass }}"
+{{- end }}
+{{- end }}
+{{- end -}}
\ No newline at end of file
diff --git a/charts/frigate/templates/deployment.yaml b/charts/frigate/templates/deployment.yaml
index cd47d57..22ff0bb 100644
--- a/charts/frigate/templates/deployment.yaml
+++ b/charts/frigate/templates/deployment.yaml
@@ -88,9 +88,15 @@ spec:
               name: usb
             {{- end }}
             - mountPath: /config
+<<<<<<< HEAD
               name: configmap
             - mountPath: /media
               name: media
+=======
+              name: config
+            - mountPath: /data
+              name: data
+>>>>>>> parent of 7f8a44b (Rename the data pvc to media)
             - name: dshm
               mountPath: /dev/shm
             {{- if .Values.extraVolumeMounts }}{{ toYaml .Values.extraVolumeMounts | trim | nindent 12 }}{{ end }}
@@ -107,10 +113,10 @@ spec:
           hostPath:
             path: {{ .Values.coral.hostPath }}
         {{- end }}
-        - name: media
-        {{- if .Values.persistence.media.enabled }}
+        - name: data
+        {{- if .Values.persistence.data.enabled }}
           persistentVolumeClaim:
-            claimName: {{ if .Values.persistence.media.existingClaim }}{{ .Values.persistence.media.existingClaim }}{{- else }}{{ template "frigate.fullname" . }}-media{{- end }}
+            claimName: {{ if .Values.persistence.data.existingClaim }}{{ .Values.persistence.data.existingClaim }}{{- else }}{{ template "frigate.fullname" . }}-data{{- end }}
         {{- else }}
           emptyDir: {}
         {{- end }}
diff --git a/charts/frigate/templates/media-pvc.yaml b/charts/frigate/templates/media-pvc.yaml
deleted file mode 100644
index 912a8d8..0000000
--- a/charts/frigate/templates/media-pvc.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-{{- if and .Values.persistence.media.enabled (not .Values.persistence.media.existingClaim) }}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metamedia:
-  name: {{ template "frigate.fullname" . }}-media
-  {{- if .Values.persistence.media.skipuninstall }}
-  annotations:
-    "helm.sh/resource-policy": keep
-  {{- end }}
-  labels:
-    app.kubernetes.io/name: {{ include "frigate.name" . }}
-    helm.sh/chart: {{ include "frigate.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
-  accessModes:
-    - {{ .Values.persistence.media.accessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.media.size | quote }}
-{{- if .Values.persistence.media.storageClass }}
-{{- if (eq "-" .Values.persistence.media.storageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: "{{ .Values.persistence.media.storageClass }}"
-{{- end }}
-{{- end }}
-{{- end -}}
diff --git a/charts/frigate/values.yaml b/charts/frigate/values.yaml
index 3065a60..33ed999 100644
--- a/charts/frigate/values.yaml
+++ b/charts/frigate/values.yaml
@@ -126,9 +126,9 @@ ingress:
   #      - chart-example.local
 
 persistence:
-  media:
+  data:
     enabled: false
-    ## frigate media Persistent Volume Storage Class
+    ## frigate configuration data Persistent Volume Storage Class
     ## If defined, storageClassName: <storageClass>
     ## If set to "-", storageClassName: "", which disables dynamic provisioning
     ## If undefined (the default) or set to null, no storageClassName spec is