Skip to content

Commit

Permalink
Revert "Rename the data pvc to media"
Browse files Browse the repository at this point in the history
This reverts commit 7f8a44b.
  • Loading branch information
brujoand committed Jul 22, 2021
1 parent 22ad3a7 commit 064aa6e
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 33 deletions.
28 changes: 28 additions & 0 deletions charts/frigate/templates/data-pvc.yaml
Original file line number Diff line number Diff line change
@@ -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 -}}
12 changes: 9 additions & 3 deletions charts/frigate/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
28 changes: 0 additions & 28 deletions charts/frigate/templates/media-pvc.yaml

This file was deleted.

4 changes: 2 additions & 2 deletions charts/frigate/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 064aa6e

Please sign in to comment.