Merge branch 'master-vnext' into feature/add-envfrom-support

charts/jellyfin/templates/deployment.yaml

@@ -115,6 +115,10 @@ spec:
               hostPort: 1900
               protocol: UDP
             {{- end }}
+          {{- with .Values.startupProbe }}
+          startupProbe:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           livenessProbe:
             {{- toYaml .Values.livenessProbe | nindent 12 }}
           readinessProbe:
@@ -126,15 +130,24 @@ spec:
               name: config
             - mountPath: /media
               name: media
+            - mountPath: /cache
+              name: cache
             {{- with .Values.volumeMounts }}
             {{- toYaml . | nindent 12 }}
             {{- end }}
         {{- with .Values.extraContainers }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
-      {{- with .Values.initContainers }}
+      {{- if or .Values.initContainers .Values.extraInitContainers }}
+      # Support both initContainers (deprecated) and extraInitContainers for backward compatibility.
+      # TODO: Remove initContainers support after 2030
       initContainers:
-        {{- toYaml . | nindent 6 }}
+        {{- if .Values.initContainers }}
+        {{- toYaml .Values.initContainers | nindent 6 }}
+        {{- end }}
+        {{- if .Values.extraInitContainers }}
+        {{- toYaml .Values.extraInitContainers | nindent 6 }}
+        {{- end }}
       {{- end }}
       volumes:
         - name: config
@@ -159,6 +172,21 @@ spec:
           {{- else }}
           emptyDir: {}
           {{- end }}
+        - name: cache
+          {{- if .Values.persistence.cache.enabled }}
+            {{- if eq .Values.persistence.cache.type "pvc" }}
+          persistentVolumeClaim:
+            claimName: {{ if .Values.persistence.cache.existingClaim }}{{ .Values.persistence.cache.existingClaim }}{{- else }}{{ template "jellyfin.fullname" . }}-cache{{- end }}
+            {{- else if eq .Values.persistence.cache.type "hostPath" }}
+          hostPath:
+            path: {{ .Values.persistence.cache.hostPath }}
+            type: Directory
+            {{- else }}
+          emptyDir: {}
+            {{- end }}
+          {{- else }}
+          emptyDir: {}
+          {{- end }}
         {{- with .Values.volumes }}
         {{- toYaml . | nindent 8 }}
         {{- end }}