[jellyfin] Move image to official (#693)

* feat!: migrate to new version on official image

* docs: example for rootless GPU transcoding

* feat!: migrate to new version on official image

* docs: example for rootless GPU transcoding

* docs: regenerate README.md

* docs: fix wording

Co-authored-by: ᗪєνιη ᗷυнʟ <onedr0p@users.noreply.github.com>

Co-authored-by: ᗪєνιη ᗷυнʟ <onedr0p@users.noreply.github.com>

README.md

@@ -3,7 +3,7 @@
 [![All Contributors](https://img.shields.io/badge/all_contributors-8-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
-[![docs](https://img.shields.io/badge/docs-rtfm-yellow?logo=gitbook&logoColor=white&style=for-the-badge)](https://github.com/pre-commit/pre-commit)
+[![docs](https://img.shields.io/badge/docs-rtfm-yellow?logo=gitbook&logoColor=white&style=for-the-badge)](https://docs.k8s-at-home.com/)
 [![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60&style=for-the-badge)](https://discord.gg/sTMX7Vh)
 [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white&style=for-the-badge)](https://github.com/pre-commit/pre-commit)
 [![renovate](https://img.shields.io/badge/renovate-enabled-brightgreen?style=for-the-badge&logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjUgNSAzNzAgMzcwIj48Y2lyY2xlIGN4PSIxODkiIGN5PSIxOTAiIHI9IjE4NCIgZmlsbD0iI2ZlMiIvPjxwYXRoIGZpbGw9IiM4YmIiIGQ9Ik0yNTEgMjU2bC0zOC0zOGExNyAxNyAwIDAxMC0yNGw1Ni01NmMyLTIgMi02IDAtN2wtMjAtMjFhNSA1IDAgMDAtNyAwbC0xMyAxMi05LTggMTMtMTNhMTcgMTcgMCAwMTI0IDBsMjEgMjFjNyA3IDcgMTcgMCAyNGwtNTYgNTdhNSA1IDAgMDAwIDdsMzggMzh6Ii8+PHBhdGggZmlsbD0iI2Q1MSIgZD0iTTMwMCAyODhsLTggOGMtNCA0LTExIDQtMTYgMGwtNDYtNDZjLTUtNS01LTEyIDAtMTZsOC04YzQtNCAxMS00IDE1IDBsNDcgNDdjNCA0IDQgMTEgMCAxNXoiLz48cGF0aCBmaWxsPSIjYjMwIiBkPSJNMjg1IDI1OGw3IDdjNCA0IDQgMTEgMCAxNWwtOCA4Yy00IDQtMTEgNC0xNiAwbC02LTdjNCA1IDExIDUgMTUgMGw4LTdjNC01IDQtMTIgMC0xNnoiLz48cGF0aCBmaWxsPSIjYTMwIiBkPSJNMjkxIDI2NGw4IDhjNCA0IDQgMTEgMCAxNmwtOCA3Yy00IDUtMTEgNS0xNSAwbC05LThjNSA1IDEyIDUgMTYgMGw4LThjNC00IDQtMTEgMC0xNXoiLz48cGF0aCBmaWxsPSIjZTYyIiBkPSJNMjYwIDIzM2wtNC00Yy02LTYtMTctNi0yMyAwLTcgNy03IDE3IDAgMjRsNCA0Yy00LTUtNC0xMSAwLTE2bDgtOGM0LTQgMTEtNCAxNSAweiIvPjxwYXRoIGZpbGw9IiNiNDAiIGQ9Ik0yODQgMzA0Yy00IDAtOC0xLTExLTRsLTQ3LTQ3Yy02LTYtNi0xNiAwLTIybDgtOGM2LTYgMTYtNiAyMiAwbDQ3IDQ2YzYgNyA2IDE3IDAgMjNsLTggOGMtMyAzLTcgNC0xMSA0em0tMzktNzZjLTEgMC0zIDAtNCAybC04IDdjLTIgMy0yIDcgMCA5bDQ3IDQ3YTYgNiAwIDAwOSAwbDctOGMzLTIgMy02IDAtOWwtNDYtNDZjLTItMi0zLTItNS0yeiIvPjxwYXRoIGZpbGw9IiMxY2MiIGQ9Ik0xNTIgMTEzbDE4LTE4IDE4IDE4LTE4IDE4em0xLTM1bDE4LTE4IDE4IDE4LTE4IDE4em0tOTAgODlsMTgtMTggMTggMTgtMTggMTh6bTM1LTM2bDE4LTE4IDE4IDE4LTE4IDE4eiIvPjxwYXRoIGZpbGw9IiMxZGQiIGQ9Ik0xMzQgMTMxbDE4LTE4IDE4IDE4LTE4IDE4em0tMzUgMzZsMTgtMTggMTggMTgtMTggMTh6Ii8+PHBhdGggZmlsbD0iIzJiYiIgZD0iTTExNiAxNDlsMTgtMTggMTggMTgtMTggMTh6bTU0LTU0bDE4LTE4IDE4IDE4LTE4IDE4em0tODkgOTBsMTgtMTggMTggMTgtMTggMTh6bTEzOS04NWwyMyAyM2M0IDQgNCAxMSAwIDE2TDE0MiAyNDBjLTQgNC0xMSA0LTE1IDBsLTI0LTI0Yy00LTQtNC0xMSAwLTE1bDEwMS0xMDFjNS01IDEyLTUgMTYgMHoiLz48cGF0aCBmaWxsPSIjM2VlIiBkPSJNMTM0IDk1bDE4LTE4IDE4IDE4LTE4IDE4em0tNTQgMThsMTgtMTcgMTggMTctMTggMTh6bTU1LTUzbDE4LTE4IDE4IDE4LTE4IDE4em05MyA0OGwtOC04Yy00LTUtMTEtNS0xNiAwTDEwMyAyMDFjLTQgNC00IDExIDAgMTVsOCA4Yy00LTQtNC0xMSAwLTE1bDEwMS0xMDFjNS00IDEyLTQgMTYgMHoiLz48cGF0aCBmaWxsPSIjOWVlIiBkPSJNMjcgMTMxbDE4LTE4IDE4IDE4LTE4IDE4em01NC01M2wxOC0xOCAxOCAxOC0xOCAxOHoiLz48cGF0aCBmaWxsPSIjMGFhIiBkPSJNMjMwIDExMGwxMyAxM2M0IDQgNCAxMSAwIDE2TDE0MiAyNDBjLTQgNC0xMSA0LTE1IDBsLTEzLTEzYzQgNCAxMSA0IDE1IDBsMTAxLTEwMWM1LTUgNS0xMSAwLTE2eiIvPjxwYXRoIGZpbGw9IiMxYWIiIGQ9Ik0xMzQgMjQ4Yy00IDAtOC0yLTExLTVsLTIzLTIzYTE2IDE2IDAgMDEwLTIzTDIwMSA5NmExNiAxNiAwIDAxMjIgMGwyNCAyNGM2IDYgNiAxNiAwIDIyTDE0NiAyNDNjLTMgMy03IDUtMTIgNXptNzgtMTQ3bC00IDItMTAxIDEwMWE2IDYgMCAwMDAgOWwyMyAyM2E2IDYgMCAwMDkgMGwxMDEtMTAxYTYgNiAwIDAwMC05bC0yNC0yMy00LTJ6Ii8+PC9zdmc+)](https://github.com/renovatebot/renovate)
@@ -65,4 +65,4 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
-This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
+This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!

charts/stable/jellyfin/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: 10.6.4
+appVersion: 10.7.0
 description: Jellyfin is a Free Software Media System
 name: jellyfin
-version: 5.2.1
+version: 6.0.0
 kubeVersion: ">=1.16.0-0"
 keywords:
 - jellyfin
@@ -11,7 +11,7 @@ keywords:
 home: https://github.com/k8s-at-home/charts/tree/master/charts/stable/Jellyfin
 icon: https://github.com/jellyfin/jellyfin-ux/blob/master/branding/SVG/icon-solid-black.svg
 sources:
-- https://hub.docker.com/r/linuxserver/Jellyfin/
+- https://hub.docker.com/r/jellyfin/jellyfin
 - https://github.com/jellyfin/jellyfin
 maintainers:
 - name: billimek

charts/stable/jellyfin/README.md

@@ -1,6 +1,6 @@
 # jellyfin
 
-![Version: 5.2.0](https://img.shields.io/badge/Version-5.2.0-informational?style=flat-square) ![AppVersion: 10.6.4](https://img.shields.io/badge/AppVersion-10.6.4-informational?style=flat-square)
+![Version: 6.0.0](https://img.shields.io/badge/Version-6.0.0-informational?style=flat-square) ![AppVersion: 10.7.0](https://img.shields.io/badge/AppVersion-10.7.0-informational?style=flat-square)
 
 Jellyfin is a Free Software Media System
 
@@ -8,7 +8,7 @@ Jellyfin is a Free Software Media System
 
 ## Source Code
 
-* <https://hub.docker.com/r/linuxserver/Jellyfin/>
+* <https://hub.docker.com/r/jellyfin/jellyfin>
 * <https://github.com/jellyfin/jellyfin>
 
 ## Requirements
@@ -77,9 +77,12 @@ N/A
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | image.pullPolicy | string | `"IfNotPresent"` |  |
-| image.repository | string | `"linuxserver/jellyfin"` |  |
-| image.tag | string | `"version-10.6.4-1"` |  |
+| image.repository | string | `"jellyfin/jellyfin"` |  |
+| image.tag | string | `"10.7.0"` |  |
 | ingress.enabled | bool | `false` |  |
+| persistence.cache.emptyDir | bool | `false` |  |
+| persistence.cache.enabled | bool | `false` |  |
+| persistence.cache.mountPath | string | `"/cache"` |  |
 | persistence.config.emptyDir | bool | `false` |  |
 | persistence.config.enabled | bool | `false` |  |
 | persistence.media.emptyDir | bool | `false` |  |
@@ -94,21 +97,43 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-### [1.0.0]
+### [6.0.0]
+
+#### Migration !breaking changes!
+
+*It is recommended to drop old configuration and start from scratch.*
+
+This release will change the layout of `config` and `cache` persistent volumes.
+To migrate the old configuration, manual modifications to volumes are required prior the upgrade or after the upgrade.
+Be aware that `cache` will only be created after the upgrade if auto provisioning is used.
+
+Mount (depends on used CSI) both volumes `config` and `cache` and be sure that jellyfin does not access the files (or is scaled down to zero).
+The volumes are assumed to be mounted on `/mnt/config` and `/mnt/cache` in the example:
+
+```bash
+cd /mnt
+mv config/cache/* cache/
+rm -r config/cache
+mkdir config/config
+mv dlna/ branding.xml encoding.xml logging.default.json migrations.xml network.xml system.xml config/
+mv data data.bak
+mv data.bak/* .
+rm -r data.bak
+sed -i "s|<CachePath>.*</CachePath>|<CachePath>/cache</CachePath>|" config/system.xml
+sed -i "s|<MetadataPath>.*</MetadataPath>|<MetadataPath>/config/metadata</MetadataPath>|" config/system.xml
+sed -i "s|<EncoderAppPath>.*</EncoderAppPath>|<EncoderAppPath>/usr/lib/jellyfin-ffmpeg/ffmpeg</EncoderAppPath>|" config/encoding.xml
+sed -i "s|<EncoderAppPathDisplay>.*</EncoderAppPathDisplay>|<EncoderAppPathDisplay>/usr/lib/jellyfin-ffmpeg/ffmpeg</EncoderAppPathDisplay>|" config/encoding.xml
+```
+
+Drop browser cache and cookies for your jellyfin URL!
 
 #### Added
 
-- N/A
+- Persistent volume definition for cache
 
 #### Changed
 
-- N/A
-
-#### Removed
-
-- N/A
-
-[1.0.0]: #1.0.0
+- Replaced LinuxServer.io image with official
 
 ## Support
 

charts/stable/jellyfin/README_CHANGELOG.md.gotmpl

@@ -9,19 +9,41 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-### [1.0.0]
+### [6.0.0]
+
+#### Migration !breaking changes!
+
+*It is recommended to drop old configuration and start from scratch.*
+
+This release will change the layout of `config` and `cache` persistent volumes.
+To migrate the old configuration, manual modifications to volumes are required prior the upgrade or after the upgrade.
+Be aware that `cache` will only be created after the upgrade if auto provisioning is used.
+
+Mount (depends on used CSI) both volumes `config` and `cache` and be sure that jellyfin does not access the files (or is scaled down to zero).
+The volumes are assumed to be mounted on `/mnt/config` and `/mnt/cache` in the example:
+
+```bash
+cd /mnt
+mv config/cache/* cache/
+rm -r config/cache
+mkdir config/config
+mv dlna/ branding.xml encoding.xml logging.default.json migrations.xml network.xml system.xml config/
+mv data data.bak
+mv data.bak/* .
+rm -r data.bak
+sed -i "s|<CachePath>.*</CachePath>|<CachePath>/cache</CachePath>|" config/system.xml
+sed -i "s|<MetadataPath>.*</MetadataPath>|<MetadataPath>/config/metadata</MetadataPath>|" config/system.xml
+sed -i "s|<EncoderAppPath>.*</EncoderAppPath>|<EncoderAppPath>/usr/lib/jellyfin-ffmpeg/ffmpeg</EncoderAppPath>|" config/encoding.xml
+sed -i "s|<EncoderAppPathDisplay>.*</EncoderAppPathDisplay>|<EncoderAppPathDisplay>/usr/lib/jellyfin-ffmpeg/ffmpeg</EncoderAppPathDisplay>|" config/encoding.xml
+```
+
+Drop browser cache and cookies for your jellyfin URL!
 
 #### Added
 
-- N/A
+- Persistent volume definition for cache
 
 #### Changed
 
-- N/A
-
-#### Removed
-
-- N/A
-
-[1.0.0]: #1.0.0
+- Replaced LinuxServer.io image with official
 {{- end -}}

charts/stable/jellyfin/values.yaml

@@ -6,9 +6,9 @@
 #
 
 image:
-  repository: linuxserver/jellyfin
+  repository: jellyfin/jellyfin
   pullPolicy: IfNotPresent
-  tag: version-10.6.4-1
+  tag: 10.7.0
 
 strategy:
   type: Recreate
@@ -25,6 +25,24 @@ persistence:
     enabled: false
     emptyDir: false
 
+  # Cache does NOT contain temporary transcoding data.
+  cache:
+    enabled: false
+    emptyDir: false
+    mountPath: /cache
+    ## 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
+    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+    ##   GKE, AWS & OpenStack)
+    # storageClass: "-"
+    # accessMode: ReadWriteOnce
+    # size: 1Gi
+    ## Do not delete the pvc upon helm uninstall
+    # skipuninstall: false
+    # existingClaim: ""
+
   media:
     enabled: false
     emptyDir: false
@@ -41,3 +59,30 @@ persistence:
     ## Do not delete the pvc upon helm uninstall
     # skipuninstall: false
     # existingClaim: ""
+
+# podSecurityContext:
+#   runAsUser: 568
+#   runAsGroup: 568
+#   fsGroup: 568
+#   # Hardware acceleration using an Intel iGPU w/ QuickSync
+#   # These IDs below should be matched to your `video` and `render` group on the host
+#   # To obtain those IDs run the following grep statement on the host:
+#   # $ cat /etc/group | grep "video\|render"
+#   # video:x:44:
+#   # render:x:109:
+#   supplementalGroups:
+#   - 44
+#   - 109
+
+# resources:
+#   requests:
+#     # Hardware acceleration using an Intel iGPU w/ QuickSync and
+#     # using intel-gpu-plugin (https://github.com/intel/intel-device-plugins-for-kubernetes)
+#     gpu.intel.com/i915: 1
+#     cpu: 200m
+#     memory: 256Mi
+#   limits:
+#     # Hardware acceleration using an Intel iGPU w/ QuickSync and
+#     # using intel-gpu-plugin (https://github.com/intel/intel-device-plugins-for-kubernetes)
+#     gpu.intel.com/i915: 1
+#     memory: 4096Mi

charts/stable/lidarr/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 0.8.0.1886
 description: Looks and smells like Sonarr but made for music
 name: lidarr
-version: 7.3.1
+version: 7.4.0
 kubeVersion: ">=1.16.0-0"
 keywords:
 - lidarr

charts/stable/lidarr/ci/ct-exportarr-values.yaml

@@ -0,0 +1,25 @@
+# Test exportarr
+persistence:
+  config:
+    enabled: true
+    emptyDir: true
+
+additionalContainers:
+- name: exportarr
+  image: ghcr.io/onedr0p/exportarr:v0.6.0
+  imagePullPolicy: IfNotPresent
+  args: ["exportarr", "lidarr"]
+  env:
+  - name: PORT
+    value: "32123"
+  - name: URL
+    value: "http://localhost"
+  - name: CONFIG
+    value: "/config/config.xml"
+  ports:
+  - name: exportarr
+    containerPort: 32123
+  volumeMounts:
+  - name: config
+    mountPath: /config
+    readOnly: true

charts/stable/lidarr/templates/podmonitor.yaml

@@ -0,0 +1,24 @@
+{{- if .Values.prometheus.podMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: {{ template "common.names.fullname" . }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+    {{- with .Values.prometheus.podMonitor.additionalLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "common.labels.selectorLabels" . | nindent 6 }}
+  podMetricsEndpoints:
+  - port: exportarr
+    {{- with .Values.prometheus.podMonitor.interval }}
+    interval: {{ . }}
+    {{- end }}
+    {{- with .Values.prometheus.podMonitor.scrapeTimeout }}
+    scrapeTimeout: {{ . }}
+    {{- end }}
+    path: /metrics
+{{- end }}

charts/stable/lidarr/values.yaml

@@ -67,3 +67,33 @@ persistence:
     ## Do not delete the pvc upon helm uninstall
     # skipuninstall: false
     # existingClaim: ""
+
+# Enable gathering Prometheus metrics
+prometheus:
+  podMonitor:
+    enabled: false
+    interval: 1m
+    scrapeTimeout: 1m30s
+    additionalLabels: {}
+
+# # When using the prometheus.podMonitor the following
+# # container is required
+# additionalContainers:
+# - name: exportarr
+#   image: ghcr.io/onedr0p/exportarr:v0.6.0
+#   imagePullPolicy: IfNotPresent
+#   args: ["exportarr", "lidarr"]
+#   env:
+#   - name: PORT
+#     value: "32123"
+#   - name: URL
+#     value: "http://localhost"
+#   - name: CONFIG
+#     value: "/config/config.xml"
+#   ports:
+#   - name: exportarr
+#     containerPort: 32123
+#   volumeMounts:
+#   - name: config
+#     mountPath: /config
+#     readOnly: true

charts/stable/radarr/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 3.0.2.4552
 description: A fork of Sonarr to work with movies à la Couchpotato
 name: radarr
-version: 9.3.1
+version: 9.4.0
 kubeVersion: ">=1.16.0-0"
 keywords:
 - radarr

charts/stable/radarr/ci/ct-exportarr-values.yaml

@@ -0,0 +1,25 @@
+# Test exportarr
+persistence:
+  config:
+    enabled: true
+    emptyDir: true
+
+additionalContainers:
+- name: exportarr
+  image: ghcr.io/onedr0p/exportarr:v0.6.0
+  imagePullPolicy: IfNotPresent
+  args: ["exportarr", "radarr"]
+  env:
+  - name: PORT
+    value: "32123"
+  - name: URL
+    value: "http://localhost"
+  - name: CONFIG
+    value: "/config/config.xml"
+  ports:
+  - name: exportarr
+    containerPort: 32123
+  volumeMounts:
+  - name: config
+    mountPath: /config
+    readOnly: true

charts/stable/radarr/templates/podmonitor.yaml

@@ -0,0 +1,24 @@
+{{- if .Values.prometheus.podMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: {{ template "common.names.fullname" . }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+    {{- with .Values.prometheus.podMonitor.additionalLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "common.labels.selectorLabels" . | nindent 6 }}
+  podMetricsEndpoints:
+  - port: exportarr
+    {{- with .Values.prometheus.podMonitor.interval }}
+    interval: {{ . }}
+    {{- end }}
+    {{- with .Values.prometheus.podMonitor.scrapeTimeout }}
+    scrapeTimeout: {{ . }}
+    {{- end }}
+    path: /metrics
+{{- end }}

charts/stable/radarr/values.yaml

@@ -67,3 +67,33 @@ persistence:
     ## Do not delete the pvc upon helm uninstall
     # skipuninstall: false
     # existingClaim: ""
+
+# Enable gathering Prometheus metrics
+prometheus:
+  podMonitor:
+    enabled: false
+    interval: 1m
+    scrapeTimeout: 1m30s
+    additionalLabels: {}
+
+# # When using the prometheus.podMonitor the following
+# # container is required
+# additionalContainers:
+# - name: exportarr
+#   image: ghcr.io/onedr0p/exportarr:v0.6.0
+#   imagePullPolicy: IfNotPresent
+#   args: ["exportarr", "radarr"]
+#   env:
+#   - name: PORT
+#     value: "32123"
+#   - name: URL
+#     value: "http://localhost"
+#   - name: CONFIG
+#     value: "/config/config.xml"
+#   ports:
+#   - name: exportarr
+#     containerPort: 32123
+#   volumeMounts:
+#   - name: config
+#     mountPath: /config
+#     readOnly: true

charts/stable/sonarr/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 3.0.4.993
 description: Smart PVR for newsgroup and bittorrent users
 name: sonarr
-version: 9.3.1
+version: 9.4.0
 kubeVersion: ">=1.16.0-0"
 keywords:
 - sonarr

charts/stable/sonarr/ci/ct-exportarr-values.yaml

@@ -0,0 +1,25 @@
+# Test exportarr
+persistence:
+  config:
+    enabled: true
+    emptyDir: true
+
+additionalContainers:
+- name: exportarr
+  image: ghcr.io/onedr0p/exportarr:v0.6.0
+  imagePullPolicy: IfNotPresent
+  args: ["exportarr", "sonarr"]
+  env:
+  - name: PORT
+    value: "32123"
+  - name: URL
+    value: "http://localhost"
+  - name: CONFIG
+    value: "/config/config.xml"
+  ports:
+  - name: exportarr
+    containerPort: 32123
+  volumeMounts:
+  - name: config
+    mountPath: /config
+    readOnly: true

charts/stable/sonarr/templates/podmonitor.yaml

@@ -0,0 +1,24 @@
+{{- if .Values.prometheus.podMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: {{ template "common.names.fullname" . }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+    {{- with .Values.prometheus.podMonitor.additionalLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "common.labels.selectorLabels" . | nindent 6 }}
+  podMetricsEndpoints:
+  - port: exportarr
+    {{- with .Values.prometheus.podMonitor.interval }}
+    interval: {{ . }}
+    {{- end }}
+    {{- with .Values.prometheus.podMonitor.scrapeTimeout }}
+    scrapeTimeout: {{ . }}
+    {{- end }}
+    path: /metrics
+{{- end }}

charts/stable/sonarr/values.yaml

@@ -67,3 +67,33 @@ persistence:
     ## Do not delete the pvc upon helm uninstall
     # skipuninstall: false
     # existingClaim: ""
+
+# Enable gathering Prometheus metrics
+prometheus:
+  podMonitor:
+    enabled: false
+    interval: 1m
+    scrapeTimeout: 1m30s
+    additionalLabels: {}
+
+# # When using the prometheus.podMonitor the following
+# # container is required
+# additionalContainers:
+# - name: exportarr
+#   image: ghcr.io/onedr0p/exportarr:v0.6.0
+#   imagePullPolicy: IfNotPresent
+#   args: ["exportarr", "sonarr"]
+#   env:
+#   - name: PORT
+#     value: "32123"
+#   - name: URL
+#     value: "http://localhost"
+#   - name: CONFIG
+#     value: "/config/config.xml"
+#   ports:
+#   - name: exportarr
+#     containerPort: 32123
+#   volumeMounts:
+#   - name: config
+#     mountPath: /config
+#     readOnly: true

hack/gen-helm-docs.sh

@@ -2,7 +2,7 @@
 set -eu
 
 # Generate helm-docs for Helm charts
-# Usage ./gen-helm-docs.sh [chart]
+# Usage ./gen-helm-docs.sh [stable/incubator] [chart]
 
 # require helm-docs
 command -v helm-docs >/dev/null 2>&1 || {
@@ -19,11 +19,11 @@ readme_config_template="${repository}/hack/templates/README_CONFIG.md.gotmpl"
 readme_changelog_template="${repository}/hack/templates/README_CHANGELOG.md.gotmpl"
 
 # Gather all charts using the common library, excluding common-test
-charts=$(find "${repository}" -name "Chart.yaml" -exec grep --exclude="*common-test*"  -l "\- name\: common" {} \;)
+charts=$(find "${repository}" -name "Chart.yaml")
 
 # Allow for a specific chart to be passed in as a argument
-if [ $# -ge 1 ] && [ -n "$1" ]; then
-    charts="${repository}/charts/$1/Chart.yaml"
+if [ $# -ge 1 ] && [ -n "$1" ] && [ -n "$2" ]; then
+    charts="${repository}/charts/$1/$2/Chart.yaml"
     root="$(dirname "${charts}")"
     if [ ! -f "$charts" ]; then
         echo "File ${charts} does not exist."