Refactor PVC configuration to simplify media persistence

Replaced `originalMedia` with unified `media` values for PVC management. This streamlines configuration, removes redundant fields, and ensures consistency across the template and values files. Adjusted related deployment logic to align with the new structure.

Author: devclef

charts/shoebox/templates/deployment.yaml

@@ -88,7 +88,7 @@ spec:
             {{- end }}
             {{- end }}
             {{- end }}
-            {{- if .Values.persistence.originalMedia.enabled }}
+            {{- if .Values.persistence.media.enabled }}
             {{- if kindIs "string" .Values.config.mediaSourcePaths }}
             - name: original-media
               mountPath: /home/user/videos
@@ -156,24 +156,18 @@ spec:
         {{- end }}
         {{- end }}
         {{- end }}
-        {{- if .Values.persistence.originalMedia.enabled }}
+        {{- if .Values.persistence.media.enabled }}
         {{- if kindIs "string" .Values.config.mediaSourcePaths }}
         - name: original-media
           persistentVolumeClaim:
-            {{- if .Values.persistence.originalMedia.existingClaim }}
-            claimName: {{ .Values.persistence.originalMedia.existingClaim }}
-            {{- else }}
             claimName: {{ include "shoebox.fullname" . }}-original-media
-            {{- end }}
         {{- else }}
         {{- range .Values.config.mediaSourcePaths.sources }}
         {{- if .originalPath }}
         - name: original-media-{{ .name | lower }}
           persistentVolumeClaim:
             {{- if .originalExistingClaim }}
             claimName: {{ .originalExistingClaim }}
-            {{- else if $.Values.persistence.originalMedia.existingClaim }}
-            claimName: {{ $.Values.persistence.originalMedia.existingClaim }}-{{ .name | lower }}
             {{- else }}
             claimName: {{ include "shoebox.fullname" $ }}-original-media-{{ .name | lower }}
             {{- end }}

charts/shoebox/templates/pvc.yaml

@@ -91,7 +91,7 @@ spec:
 {{- end }}
 {{- end }}
 
-{{- if and .Values.persistence.originalMedia.enabled (not .Values.persistence.originalMedia.existingClaim) }}
+{{- if .Values.persistence.media.enabled }}
 {{- if kindIs "string" .Values.config.mediaSourcePaths }}
 ---
 apiVersion: v1
@@ -102,12 +102,12 @@ metadata:
     {{- include "shoebox.labels" . | nindent 4 }}
 spec:
   accessModes:
-    - {{ .Values.persistence.originalMedia.accessMode }}
+    - {{ .Values.persistence.media.accessMode }}
   resources:
     requests:
-      storage: {{ .Values.persistence.originalMedia.size }}
-  {{- if .Values.persistence.originalMedia.storageClass }}
-  storageClassName: {{ .Values.persistence.originalMedia.storageClass }}
+      storage: {{ .Values.persistence.media.size }}
+  {{- if .Values.persistence.media.storageClass }}
+  storageClassName: {{ .Values.persistence.media.storageClass }}
   {{- end }}
 {{- else }}
 {{- range .Values.config.mediaSourcePaths.sources }}
@@ -121,12 +121,12 @@ metadata:
     {{- include "shoebox.labels" $ | nindent 4 }}
 spec:
   accessModes:
-    - {{ $.Values.persistence.originalMedia.accessMode }}
+    - {{ $.Values.persistence.media.accessMode }}
   resources:
     requests:
-      storage: {{ $.Values.persistence.originalMedia.size }}
-  {{- if $.Values.persistence.originalMedia.storageClass }}
-  storageClassName: {{ $.Values.persistence.originalMedia.storageClass }}
+      storage: {{ $.Values.persistence.media.size }}
+  {{- if $.Values.persistence.media.storageClass }}
+  storageClassName: {{ $.Values.persistence.media.storageClass }}
   {{- end }}
 {{- end }}
 {{- end }}

charts/shoebox/values.yaml

@@ -144,16 +144,6 @@ persistence:
     storageClass: ""
     accessMode: ReadOnlyMany
 
-  # Original media source directory (read-only)
-  # This is used for the originalPath in mediaSourcePaths
-  originalMedia:
-    enabled: true
-    # This should be a PV that points to your original media storage
-    existingClaim: ""
-    # If no existing claim, create a PVC with these settings
-    size: 100Gi
-    storageClass: ""
-    accessMode: ReadOnlyMany
 
 # Optional PostgreSQL dependency
 postgresql: