From 4e9a1909054c6348d3b2d4aaf6993e9ec916bbc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=E1=B4=87=CA=80=C9=B4=E1=B4=85=20S=E1=B4=84=CA=9C?=
 =?UTF-8?q?=E1=B4=8F=CA=80=C9=A2=E1=B4=87=CA=80s?= <me@bjw-s.dev>
Date: Fri, 25 Jun 2021 13:52:14 +0200
Subject: [PATCH] [multiple] Migrate to common v3 (#1063)

---
 .taskfiles/Taskfile_chart.yml                 | 10 ++-
 charts/stable/magic-mirror/Chart.yaml         |  6 +-
 charts/stable/magic-mirror/README.md          | 36 ++++++----
 .../magic-mirror/README_CHANGELOG.md.gotmpl   | 11 ++-
 .../stable/magic-mirror/templates/common.yaml | 68 ++++++-------------
 .../magic-mirror/templates/configmap.yaml     |  6 +-
 charts/stable/magic-mirror/values.yaml        | 45 +++++++-----
 charts/stable/modem-stats/Chart.yaml          |  4 +-
 charts/stable/modem-stats/README.md           | 30 ++++----
 .../modem-stats/README_CHANGELOG.md.gotmpl    | 12 +++-
 .../stable/modem-stats/templates/common.yaml  | 46 +++++++------
 .../modem-stats/templates/configmap.yaml      |  2 +-
 charts/stable/modem-stats/values.yaml         | 24 +++----
 charts/stable/monica/Chart.yaml               |  6 +-
 charts/stable/monica/README.md                | 48 +++++++------
 .../stable/monica/README_CHANGELOG.md.gotmpl  | 11 ++-
 charts/stable/monica/ci/ct-values.yaml        |  4 +-
 charts/stable/monica/values.yaml              | 62 +++++++++++------
 charts/stable/mylar/Chart.yaml                |  6 +-
 charts/stable/mylar/README.md                 | 41 ++++++-----
 .../stable/mylar/README_CHANGELOG.md.gotmpl   | 12 +++-
 charts/stable/mylar/values.yaml               | 45 ++++++------
 charts/stable/navidrome/Chart.yaml            |  6 +-
 charts/stable/navidrome/README.md             | 46 +++++++------
 .../navidrome/README_CHANGELOG.md.gotmpl      | 11 ++-
 charts/stable/navidrome/values.yaml           | 62 +++++++----------
 charts/stable/neolink/Chart.yaml              |  4 +-
 charts/stable/neolink/README.md               | 27 +++++---
 .../stable/neolink/README_CHANGELOG.md.gotmpl | 10 ++-
 charts/stable/neolink/templates/common.yaml   | 37 ++++------
 .../stable/neolink/templates/configmap.yaml   |  8 +--
 charts/stable/neolink/values.yaml             | 25 ++++---
 32 files changed, 427 insertions(+), 344 deletions(-)

diff --git a/.taskfiles/Taskfile_chart.yml b/.taskfiles/Taskfile_chart.yml
index c3438008..f14ed1fc 100644
--- a/.taskfiles/Taskfile_chart.yml
+++ b/.taskfiles/Taskfile_chart.yml
@@ -25,6 +25,14 @@ tasks:
     - helm dependency update
     silent: true
 
+  dependency-cleanup:
+    desc: clean up chart dependencies
+    dir: "{{.GIT_ROOT}}/charts"
+    cmds:
+    - find {{.GIT_ROOT}}/charts/ -type f -name 'Chart.lock' -mindepth 1 -print0 | xargs -0 rm \;
+    - find {{.GIT_ROOT}}/charts/ -type d -name 'charts' -mindepth 1 -print0 | xargs -0 rm -rf \;
+    silent: true
+
   lint:
     desc: lint your chart code
     dir: "{{.GIT_ROOT}}/charts/{{.CHART_TYPE}}/{{.CHART}}"
@@ -41,7 +49,7 @@ tasks:
     deps:
     - check-chart
     - lint
-  
+
   helm-docs:
     desc: generate helm-docs
     dir: "{{.GIT_ROOT}}/hack"
diff --git a/charts/stable/magic-mirror/Chart.yaml b/charts/stable/magic-mirror/Chart.yaml
index fe198194..6b1448d1 100644
--- a/charts/stable/magic-mirror/Chart.yaml
+++ b/charts/stable/magic-mirror/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: v2.14.0
+appVersion: v2.15.0
 description: magic-mirror helm package
 name: magic-mirror
-version: 2.4.0
+version: 3.0.0
 kubeVersion: ">=1.16.0-0"
 keywords:
 - magic-mirror
@@ -16,4 +16,4 @@ maintainers:
 dependencies:
 - name: common
   repository: https://library-charts.k8s-at-home.com
-  version: 2.5.0
+  version: 3.2.0
diff --git a/charts/stable/magic-mirror/README.md b/charts/stable/magic-mirror/README.md
index 51a844c9..be4b7404 100644
--- a/charts/stable/magic-mirror/README.md
+++ b/charts/stable/magic-mirror/README.md
@@ -1,6 +1,6 @@
 # magic-mirror
 
-![Version: 2.4.0](https://img.shields.io/badge/Version-2.4.0-informational?style=flat-square) ![AppVersion: v2.14.0](https://img.shields.io/badge/AppVersion-v2.14.0-informational?style=flat-square)
+![Version: 3.0.0](https://img.shields.io/badge/Version-3.0.0-informational?style=flat-square) ![AppVersion: v2.15.0](https://img.shields.io/badge/AppVersion-v2.15.0-informational?style=flat-square)
 
 magic-mirror helm package
 
@@ -19,7 +19,7 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://library-charts.k8s-at-home.com | common | 2.5.0 |
+| https://library-charts.k8s-at-home.com | common | 3.2.0 |
 
 ## TL;DR
 
@@ -78,17 +78,16 @@ The default login details (change ASAP) are:
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| config | string | `"var config = {\n  address: \"0.0.0.0\",\n  port: 8080,\n  ipWhitelist: [],\n  language: \"en\",\n  timeFormat: 24,\n  units: \"metric\",\n  modules: [],\n};\n\n/*************** DO NOT EDIT THE LINE BELOW ***************/\nif (typeof module !== \"undefined\") {module.exports = config;}\n"` |  |
-| custom_css | string | `""` |  |
-| env | object | `{}` |  |
-| image.pullPolicy | string | `"IfNotPresent"` |  |
-| image.repository | string | `"bastilimbach/docker-magicmirror"` |  |
-| image.tag | string | `"v2.14.0"` |  |
-| ingress.enabled | bool | `false` |  |
-| persistence.data.enabled | bool | `false` |  |
-| persistence.data.mountPath | string | `"/opt/magic_mirror/modules/custom"` |  |
-| service.port.port | int | `8080` |  |
-| strategy.type | string | `"Recreate"` |  |
+| config | string | See values.yaml | Contents of your config.js, supports Helm templates. See [application docs](https://docs.magicmirror.builders/getting-started/configuration.html) for more details. |
+| custom_css | string | `""` | Contents of your custom.css |
+| env | object | See below | environment variables. See [image docs](https://github.com/bastilimbach/docker-MagicMirror) for more details. |
+| env.TZ | string | `"UTC"` | Set the container timezone |
+| image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
+| image.repository | string | `"bastilimbach/docker-magicmirror"` | image repository |
+| image.tag | string | `"v2.15.0"` | image tag |
+| ingress.main | object | See values.yaml | Enable and configure ingress settings for the chart under this key. |
+| persistence | object | See values.yaml | Configure persistence settings for the chart under this key. |
+| service | object | See values.yaml | Configures service settings for the chart. |
 
 ## Changelog
 
@@ -96,6 +95,14 @@ 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).
 
+### [3.0.0]
+
+#### Changed
+
+- **BREAKING**: Upgraded the common library dependency to version 3.2.0. This introduces several breaking changes (`service`, `ingress` and `persistence` keys have been refactored).
+  Be sure to check out the [library chart](https://github.com/k8s-at-home/library-charts/blob/common-3.2.0/charts/stable/common/) for the up-to-date values.
+- Changed image tag to `v2.15.0`.
+
 ### [1.0.0]
 
 #### Added
@@ -110,7 +117,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - N/A
 
-[1.0.0]: #1.0.0
+[3.0.0]: #300
+[1.0.0]: #100
 
 ## Support
 
diff --git a/charts/stable/magic-mirror/README_CHANGELOG.md.gotmpl b/charts/stable/magic-mirror/README_CHANGELOG.md.gotmpl
index 457def03..b9196296 100644
--- a/charts/stable/magic-mirror/README_CHANGELOG.md.gotmpl
+++ b/charts/stable/magic-mirror/README_CHANGELOG.md.gotmpl
@@ -9,6 +9,14 @@ 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).
 
+### [3.0.0]
+
+#### Changed
+
+- **BREAKING**: Upgraded the common library dependency to version 3.2.0. This introduces several breaking changes (`service`, `ingress` and `persistence` keys have been refactored).
+  Be sure to check out the [library chart](https://github.com/k8s-at-home/library-charts/blob/common-3.2.0/charts/stable/common/) for the up-to-date values.
+- Changed image tag to `v2.15.0`.
+
 ### [1.0.0]
 
 #### Added
@@ -23,5 +31,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - N/A
 
-[1.0.0]: #1.0.0
+[3.0.0]: #300
+[1.0.0]: #100
 {{- end -}}
diff --git a/charts/stable/magic-mirror/templates/common.yaml b/charts/stable/magic-mirror/templates/common.yaml
index 99ed37c8..f6c86877 100644
--- a/charts/stable/magic-mirror/templates/common.yaml
+++ b/charts/stable/magic-mirror/templates/common.yaml
@@ -1,53 +1,29 @@
+---
 {{/* Make sure all variables are set properly */}}
 {{- include "common.values.setup" . }}
 
-{{/* Append the configMaps to the additionalVolumes */}}
-{{- define "magicmirror.configmap.volume" -}}
-name: magic-mirror-config
-configMap:
-  name: {{ template "common.names.fullname" . }}-config
-{{- end -}}
+{{/* Append the hardcoded settings */}}
+{{- define "magic-mirror.harcodedValues" -}}
+persistence:
+  magic-mirror-config:
+    enabled: "true"
+    mountPath: "/opt/magic_mirror/config/config.js"
+    subPath: "config.js"
+    type: "custom"
+    volumeSpec:
+      configMap:
+        name: {{ printf "%v-config" (include "common.names.fullname" .) }}
 
-{{- define "magicmirror.css.volume" -}}
-name: magic-mirror-css
-configMap:
-  name: {{ template "common.names.fullname" . }}-css
+  magic-mirror-css:
+    enabled: "true"
+    mountPath: "/opt/magic_mirror/css/custom.css"
+    subPath: "custom.css"
+    type: "custom"
+    volumeSpec:
+      configMap:
+        name: {{ printf "%v-css" (include "common.names.fullname" .) }}
 {{- end -}}
+{{- $_ := mergeOverwrite .Values (include "magic-mirror.harcodedValues" . | fromYaml) -}}
 
-{{- $volume := include "magicmirror.configmap.volume" . | fromYaml -}}
-{{- if $volume -}}
-    {{- $additionalVolumes := append .Values.additionalVolumes $volume }}
-    {{- $_ := set .Values "additionalVolumes" (deepCopy $additionalVolumes) -}}
-{{- end -}}
-
-{{- $volume := include "magicmirror.css.volume" . | fromYaml -}}
-{{- if $volume -}}
-    {{- $additionalVolumes := append .Values.additionalVolumes $volume }}
-    {{- $_ := set .Values "additionalVolumes" (deepCopy $additionalVolumes) -}}
-{{- end -}}
-
-{{/* Append the configMap volumes to the additionalVolumeMounts */}}
-{{- define "magicmirror.configmap.volumeMount" -}}
-name: magic-mirror-config
-mountPath: /opt/magic_mirror/config/config.js
-subPath: config.js
-{{- end -}}
-
-{{- define "magicmirror.css.volumeMount" -}}
-name: magic-mirror-css
-mountPath: /opt/magic_mirror/css/custom.css
-subPath: custom.css
-{{- end -}}
-
-{{- $volumeMount := include "magicmirror.configmap.volumeMount" . | fromYaml -}}
-{{- if $volumeMount -}}
-    {{- $additionalVolumeMounts := append .Values.additionalVolumeMounts $volumeMount }}
-    {{- $_ := set .Values "additionalVolumeMounts" (deepCopy $additionalVolumeMounts) -}}
-{{- end -}}
-
-{{- $volumeMount := include "magicmirror.css.volumeMount" . | fromYaml -}}
-{{- if $volumeMount -}}
-    {{- $additionalVolumeMounts := append .Values.additionalVolumeMounts $volumeMount }}
-    {{- $_ := set .Values "additionalVolumeMounts" (deepCopy $additionalVolumeMounts) -}}
-{{- end -}}
+{{/* Render the templates */}}
 {{ include "common.all" . }}
diff --git a/charts/stable/magic-mirror/templates/configmap.yaml b/charts/stable/magic-mirror/templates/configmap.yaml
index 66fbaa64..bd756c6b 100644
--- a/charts/stable/magic-mirror/templates/configmap.yaml
+++ b/charts/stable/magic-mirror/templates/configmap.yaml
@@ -2,17 +2,17 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ template "common.names.fullname" . }}-config
+  name: {{ include "common.names.fullname" . }}-config
   labels:
     {{- include "common.labels" . | nindent 4 }}
 data:
   config.js: |
-    {{- .Values.config | nindent 4 }}
+    {{- tpl .Values.config $ | nindent 4 }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ template "common.names.fullname" . }}-css
+  name: {{ include "common.names.fullname" . }}-css
   labels:
     {{- include "common.labels" . | nindent 4 }}
 data:
diff --git a/charts/stable/magic-mirror/values.yaml b/charts/stable/magic-mirror/values.yaml
index 403ee285..b246c5d9 100644
--- a/charts/stable/magic-mirror/values.yaml
+++ b/charts/stable/magic-mirror/values.yaml
@@ -5,33 +5,47 @@
 #
 
 image:
+  # -- image repository
   repository: bastilimbach/docker-magicmirror
+  # -- image tag
+  tag: v2.15.0
+  # -- image pull policy
   pullPolicy: IfNotPresent
-  tag: v2.14.0
 
-strategy:
-  type: Recreate
+# -- environment variables. See [image docs](https://github.com/bastilimbach/docker-MagicMirror) for more details.
+# @default -- See below
+env:
+  # -- Set the container timezone
+  TZ: UTC
 
+# -- Configures service settings for the chart.
+# @default -- See values.yaml
 service:
-  port:
-    port: 8080
+  main:
+    ports:
+      http:
+        port: 8080
 
 ingress:
-  enabled: false
+  # -- Enable and configure ingress settings for the chart under this key.
+  # @default -- See values.yaml
+  main:
+    enabled: false
 
+# -- Configure persistence settings for the chart under this key.
+# @default -- See values.yaml
 persistence:
   data:
     enabled: false
     mountPath: "/opt/magic_mirror/modules/custom"
 
-# Contents of your custom.css
-custom_css: ""
-
-# Contents of your config.js
+# -- Contents of your config.js, supports Helm templates.
+# See [application docs](https://docs.magicmirror.builders/getting-started/configuration.html) for more details.
+# @default -- See values.yaml
 config: |
   var config = {
     address: "0.0.0.0",
-    port: 8080,
+    port: {{ .Values.service.main.ports.http.port }},
     ipWhitelist: [],
     language: "en",
     timeFormat: 24,
@@ -42,10 +56,5 @@ config: |
   /*************** DO NOT EDIT THE LINE BELOW ***************/
   if (typeof module !== "undefined") {module.exports = config;}
 
-env: {}
-  ## Optional ENV Vars that can be set.
-  ## All values below are the current default values.
-  # PUID: "1000"
-  # PGID: "1000"
-  # TZ: "Europe/Oslo"
-  # UMASK_SET: "022"
+# -- Contents of your custom.css
+custom_css: ""
diff --git a/charts/stable/modem-stats/Chart.yaml b/charts/stable/modem-stats/Chart.yaml
index d1eb82e1..7fba89b3 100644
--- a/charts/stable/modem-stats/Chart.yaml
+++ b/charts/stable/modem-stats/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: modem-stats
-version: 4.1.0
+version: 5.0.0
 appVersion: 1.0.0
 description: periodic cable modem data collection and save the results to InfluxDB
 keywords:
@@ -17,4 +17,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://library-charts.k8s-at-home.com
-    version: 2.5.0
+    version: 3.2.0
diff --git a/charts/stable/modem-stats/README.md b/charts/stable/modem-stats/README.md
index 6345f3a3..564aff43 100644
--- a/charts/stable/modem-stats/README.md
+++ b/charts/stable/modem-stats/README.md
@@ -1,6 +1,6 @@
 # modem-stats
 
-![Version: 4.1.0](https://img.shields.io/badge/Version-4.1.0-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square)
+![Version: 5.0.0](https://img.shields.io/badge/Version-5.0.0-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square)
 
 periodic cable modem data collection and save the results to InfluxDB
 
@@ -17,7 +17,7 @@ periodic cable modem data collection and save the results to InfluxDB
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://library-charts.k8s-at-home.com | common | 2.5.0 |
+| https://library-charts.k8s-at-home.com | common | 3.2.0 |
 
 ## TL;DR
 
@@ -77,15 +77,11 @@ The configuration is set as a block of text through a configmap and mouted as a
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | config | string | string | modem-stats' config.ini configuration |
-| env | object | `{}` |  |
-| image.pullPolicy | string | `"IfNotPresent"` |  |
-| image.repository | string | `"billimek/sb6183-for-influxdb"` |  |
-| image.tag | string | `"latest"` |  |
-| probes.liveness.enabled | bool | `false` |  |
-| probes.readiness.enabled | bool | `false` |  |
-| probes.startup.enabled | bool | `false` |  |
-| service.enabled | bool | `false` |  |
-| strategy.type | string | `"Recreate"` |  |
+| env | object | See below | environment variables. |
+| env.TZ | string | `"UTC"` | Set the container timezone |
+| image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
+| image.repository | string | `"billimek/sb6183-for-influxdb"` | image repository |
+| image.tag | string | `"latest"` | image tag |
 
 ## Changelog
 
@@ -93,6 +89,13 @@ 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).
 
+### [5.0.0]
+
+#### Changed
+
+- **BREAKING**: Upgraded the common library dependency to version 3.2.0. This introduces several breaking changes (`service`, `ingress` and `persistence` keys have been refactored).
+  Be sure to check out the [library chart](https://github.com/k8s-at-home/library-charts/blob/common-3.2.0/charts/stable/common/) for the up-to-date values.
+
 ### [4.0.0]
 
 #### Added
@@ -121,8 +124,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - N/A
 
-[4.0.0]: #4.0.0
-[3.0.1]: #3.0.1
+[5.0.0]: #500
+[4.0.0]: #400
+[3.0.1]: #301
 
 ## Support
 
diff --git a/charts/stable/modem-stats/README_CHANGELOG.md.gotmpl b/charts/stable/modem-stats/README_CHANGELOG.md.gotmpl
index cf8294e8..6924db9a 100644
--- a/charts/stable/modem-stats/README_CHANGELOG.md.gotmpl
+++ b/charts/stable/modem-stats/README_CHANGELOG.md.gotmpl
@@ -9,6 +9,13 @@ 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).
 
+### [5.0.0]
+
+#### Changed
+
+- **BREAKING**: Upgraded the common library dependency to version 3.2.0. This introduces several breaking changes (`service`, `ingress` and `persistence` keys have been refactored).
+  Be sure to check out the [library chart](https://github.com/k8s-at-home/library-charts/blob/common-3.2.0/charts/stable/common/) for the up-to-date values.
+
 ### [4.0.0]
 
 #### Added
@@ -37,6 +44,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - N/A
 
-[4.0.0]: #4.0.0
-[3.0.1]: #3.0.1
+[5.0.0]: #500
+[4.0.0]: #400
+[3.0.1]: #301
 {{- end -}}
diff --git a/charts/stable/modem-stats/templates/common.yaml b/charts/stable/modem-stats/templates/common.yaml
index ebf7be03..df56c63a 100644
--- a/charts/stable/modem-stats/templates/common.yaml
+++ b/charts/stable/modem-stats/templates/common.yaml
@@ -2,31 +2,33 @@
 {{/* Make sure all variables are set properly */}}
 {{- include "common.values.setup" . }}
 
-{{/* Append the configMap to the additionalVolumes */}}
-{{- define "modem-stats.configmap.volume" -}}
-name: modem-stats-settings
-configMap:
-  name: {{ template "common.names.fullname" . }}-config
-{{- end -}}
+{{/* Append the hardcoded settings */}}
+{{- define "modem-stats.harcodedValues" -}}
+persistence:
+  modem-stats-settings:
+    enabled: "true"
+    mountPath: "/src/config.ini"
+    subPath: "config.ini"
+    type: "custom"
+    volumeSpec:
+      configMap:
+        name: {{ printf "%v-config" (include "common.names.fullname" .) }}
 
-{{- $volume := include "modem-stats.configmap.volume" . | fromYaml -}}
-{{- if $volume -}}
-    {{- $additionalVolumes := append .Values.additionalVolumes $volume }}
-    {{- $_ := set .Values "additionalVolumes" (deepCopy $additionalVolumes) -}}
-{{- end -}}
+# -- Disable service
+service:
+  main:
+    enabled: false
 
-{{/* Append the configMap volume to the additionalVolumeMounts */}}
-{{- define "modem-stats.configmap.volumeMount" -}}
-name: modem-stats-settings
-mountPath: /src/config.ini
-subPath: config.ini
-{{- end -}}
-
-{{- $volumeMount := include "modem-stats.configmap.volumeMount" . | fromYaml -}}
-{{- if $volumeMount -}}
-    {{- $additionalVolumeMounts := append .Values.additionalVolumeMounts $volumeMount }}
-    {{- $_ := set .Values "additionalVolumeMounts" (deepCopy $additionalVolumeMounts) -}}
+# -- Disable probes because no service is present
+probes:
+  liveness:
+    enabled: false
+  readiness:
+    enabled: false
+  startup:
+    enabled: false
 {{- end -}}
+{{- $_ := mergeOverwrite .Values (include "modem-stats.harcodedValues" . | fromYaml) -}}
 
 {{/* Render the templates */}}
 {{ include "common.all" . }}
diff --git a/charts/stable/modem-stats/templates/configmap.yaml b/charts/stable/modem-stats/templates/configmap.yaml
index 5ca597fe..5e3ab57a 100644
--- a/charts/stable/modem-stats/templates/configmap.yaml
+++ b/charts/stable/modem-stats/templates/configmap.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ template "common.names.fullname" . }}-config
+  name: {{ include "common.names.fullname" . }}-config
   labels:
     {{- include "common.labels" . | nindent 4 }}
 data:
diff --git a/charts/stable/modem-stats/values.yaml b/charts/stable/modem-stats/values.yaml
index 552b73dc..57d4d5fa 100644
--- a/charts/stable/modem-stats/values.yaml
+++ b/charts/stable/modem-stats/values.yaml
@@ -6,14 +6,18 @@
 #
 
 image:
+  # -- image repository
   repository: billimek/sb6183-for-influxdb
+  # -- image tag
   tag: latest
+  # -- image pull policy
   pullPolicy: IfNotPresent
 
-strategy:
-  type: Recreate
-
-env: {}
+# -- environment variables.
+# @default -- See below
+env:
+  # -- Set the container timezone
+  TZ: UTC
 
 # -- modem-stats' config.ini configuration
 # @default -- string
@@ -30,15 +34,3 @@ config: |
   Verify_SSL = False
   [MODEM]
   URL = http://192.168.100.1/RgConnect.asp
-
-service:
-  enabled: false
-
-## Probes configuration
-probes:
-  liveness:
-    enabled: false
-  readiness:
-    enabled: false
-  startup:
-    enabled: false
diff --git a/charts/stable/monica/Chart.yaml b/charts/stable/monica/Chart.yaml
index 30a9a73f..a002738a 100644
--- a/charts/stable/monica/Chart.yaml
+++ b/charts/stable/monica/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: v2.19.1
+appVersion: 3.1.1-apache
 description: A Personal Relationship Management tool to help you organize your social life
 name: monica
-version: 4.4.1
+version: 5.0.0
 kubeVersion: ">=1.16.0-0"
 keywords:
 - crm
@@ -17,7 +17,7 @@ maintainers:
 dependencies:
 - name: common
   repository: https://library-charts.k8s-at-home.com
-  version: 2.5.0
+  version: 3.2.0
 - name: mariadb
   version: 9.3.13
   repository: https://charts.bitnami.com/bitnami
diff --git a/charts/stable/monica/README.md b/charts/stable/monica/README.md
index 71f7c5f3..c986621e 100644
--- a/charts/stable/monica/README.md
+++ b/charts/stable/monica/README.md
@@ -1,6 +1,6 @@
 # monica
 
-![Version: 4.4.1](https://img.shields.io/badge/Version-4.4.1-informational?style=flat-square) ![AppVersion: v2.19.1](https://img.shields.io/badge/AppVersion-v2.19.1-informational?style=flat-square)
+![Version: 5.0.0](https://img.shields.io/badge/Version-5.0.0-informational?style=flat-square) ![AppVersion: 3.1.1-apache](https://img.shields.io/badge/AppVersion-3.1.1--apache-informational?style=flat-square)
 
 A Personal Relationship Management tool to help you organize your social life
 
@@ -20,7 +20,7 @@ Kubernetes: `>=1.16.0-0`
 | Repository | Name | Version |
 |------------|------|---------|
 | https://charts.bitnami.com/bitnami | mariadb | 9.3.13 |
-| https://library-charts.k8s-at-home.com | common | 2.5.0 |
+| https://library-charts.k8s-at-home.com | common | 3.2.0 |
 
 ## TL;DR
 
@@ -77,23 +77,22 @@ N/A
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| env | object | `{}` |  |
-| image.pullPolicy | string | `"IfNotPresent"` |  |
-| image.repository | string | `"monica"` |  |
-| image.tag | string | `"2.19.1-apache"` |  |
-| ingress.enabled | bool | `false` |  |
-| mariadb.architecture | string | `"standalone"` |  |
-| mariadb.auth.database | string | `"monica"` |  |
-| mariadb.auth.password | string | `"monicapass"` |  |
-| mariadb.auth.rootPassword | string | `"monicarootpass"` |  |
-| mariadb.auth.username | string | `"monica"` |  |
-| mariadb.enabled | bool | `false` |  |
-| mariadb.primary.persistence.enabled | bool | `false` |  |
-| persistence.config.emptyDir.enabled | bool | `false` |  |
-| persistence.config.enabled | bool | `false` |  |
-| persistence.config.mountPath | string | `"/var/www/html/storage"` |  |
-| service.port.port | int | `80` |  |
-| strategy.type | string | `"Recreate"` |  |
+| env | object | See below | environment variables. See [monica documentation](https://raw.githubusercontent.com/monicahq/monica/master/.env.example) for more details. |
+| env.APP_ENV | string | `"production"` | Use `local` if you want to install Monica as a development version. Use `production` otherwise. |
+| env.APP_KEY | string | `nil` | The encryption key. This is the most important part of the application.  Keep this secure otherwise, everyone will be able to access your application. Must be 32 characters long exactly. Use `php artisan key:generate` or `echo -n 'base64:'; openssl rand -base64 32` to generate a random key. |
+| env.APP_URL | string | `"https://crm.k8s-at-home.com"` | The URL of your application. |
+| env.DB_DATABASE | string | `nil` | Database to connect to |
+| env.DB_HOST | string | `nil` | Database hostname |
+| env.DB_PASSWORD | string | `nil` | Database password |
+| env.DB_USERNAME | string | `nil` | Database username |
+| env.TZ | string | `"UTC"` | Set the container timezone |
+| image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
+| image.repository | string | `"monica"` | image repository |
+| image.tag | string | `"3.1.1-apache"` | image tag |
+| ingress.main | object | See values.yaml | Enable and configure ingress settings for the chart under this key. |
+| mariadb | object | See values.yaml | Enable and configure mariadb database subchart under this key.    For more options see [mariadb chart documentation](https://github.com/bitnami/charts/tree/master/bitnami/mariadb) |
+| persistence | object | See values.yaml | Configure persistence settings for the chart under this key. |
+| service | object | See values.yaml | Configures service settings for the chart. |
 
 ## Changelog
 
@@ -101,6 +100,14 @@ 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).
 
+### [5.0.0]
+
+#### Changed
+
+- **BREAKING**: Upgraded the common library dependency to version 3.2.0. This introduces several breaking changes (`service`, `ingress` and `persistence` keys have been refactored).
+  Be sure to check out the [library chart](https://github.com/k8s-at-home/library-charts/blob/common-3.2.0/charts/stable/common/) for the up-to-date values.
+- Changed image tag to `3.1.1-apache`.
+
 ### [1.0.0]
 
 #### Added
@@ -115,7 +122,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - N/A
 
-[1.0.0]: #1.0.0
+[5.0.0]: #500
+[1.0.0]: #100
 
 ## Support
 
diff --git a/charts/stable/monica/README_CHANGELOG.md.gotmpl b/charts/stable/monica/README_CHANGELOG.md.gotmpl
index 457def03..36c5a56f 100644
--- a/charts/stable/monica/README_CHANGELOG.md.gotmpl
+++ b/charts/stable/monica/README_CHANGELOG.md.gotmpl
@@ -9,6 +9,14 @@ 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).
 
+### [5.0.0]
+
+#### Changed
+
+- **BREAKING**: Upgraded the common library dependency to version 3.2.0. This introduces several breaking changes (`service`, `ingress` and `persistence` keys have been refactored).
+  Be sure to check out the [library chart](https://github.com/k8s-at-home/library-charts/blob/common-3.2.0/charts/stable/common/) for the up-to-date values.
+- Changed image tag to `3.1.1-apache`.
+
 ### [1.0.0]
 
 #### Added
@@ -23,5 +31,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - N/A
 
-[1.0.0]: #1.0.0
+[5.0.0]: #500
+[1.0.0]: #100
 {{- end -}}
diff --git a/charts/stable/monica/ci/ct-values.yaml b/charts/stable/monica/ci/ct-values.yaml
index 229e7a6d..0ce57d01 100644
--- a/charts/stable/monica/ci/ct-values.yaml
+++ b/charts/stable/monica/ci/ct-values.yaml
@@ -1,5 +1,4 @@
 env:
-  APP_ENV: production
   APP_KEY: pG335ncsoY7z18CLdpXOp0JXGYKMtFa1
   APP_URL: https://crm.k8s-at-home.com
   DB_HOST: monica-mariadb
@@ -8,7 +7,8 @@ env:
   DB_PASSWORD: monicapass
 
 ingress:
-  enabled: true
+  main:
+    enabled: true
 
 fullnameOverride: monica
 
diff --git a/charts/stable/monica/values.yaml b/charts/stable/monica/values.yaml
index 4b6edecf..76535b64 100644
--- a/charts/stable/monica/values.yaml
+++ b/charts/stable/monica/values.yaml
@@ -6,40 +6,60 @@
 #
 
 image:
+  # -- image repository
   repository: monica
+  # -- image tag
+  tag: 3.1.1-apache
+  # -- image pull policy
   pullPolicy: IfNotPresent
-  tag: 2.19.1-apache
 
-strategy:
-  type: Recreate
-
-env: {}
-  # See the Monica documentation for all available options for environment variables: https://raw.githubusercontent.com/monicahq/monica/master/.env.example
-  # APP_ENV: production
-  # Generate a different APP_KEY with `pwgen -s 32 1`
-  # APP_KEY: pG335ncsoY7z18CLdpXOp0JXGYKMtFa1
-  # APP_URL: https://crm.k8s-at-home.com
-  # DB_HOST: monica-mariadb
-  # DB_DATABASE: monica
-  # DB_USERNAME: monica
-  # DB_PASSWORD: monicapass
+# -- environment variables. See [monica documentation](https://raw.githubusercontent.com/monicahq/monica/master/.env.example) for more details.
+# @default -- See below
+env:
+  # -- Set the container timezone
+  TZ: UTC
+  # -- Use `local` if you want to install Monica as a development version. Use `production` otherwise.
+  APP_ENV: production
+  # -- The encryption key. This is the most important part of the application.
+  # Keep this secure otherwise, everyone will be able to access your application.
+  # Must be 32 characters long exactly.
+  # Use `php artisan key:generate` or `echo -n 'base64:'; openssl rand -base64 32` to generate a random key.
+  APP_KEY:
+  # -- The URL of your application.
+  APP_URL: https://crm.k8s-at-home.com
+  # -- Database hostname
+  DB_HOST:  # monica-mariadb
+  # -- Database to connect to
+  DB_DATABASE:  # monica
+  # -- Database username
+  DB_USERNAME:  # monica
+  # -- Database password
+  DB_PASSWORD:  # monicapass
 
+# -- Configures service settings for the chart.
+# @default -- See values.yaml
 service:
-  port:
-    port: 80
+  main:
+    ports:
+      http:
+        port: 80
 
 ingress:
-  enabled: false
+  # -- Enable and configure ingress settings for the chart under this key.
+  # @default -- See values.yaml
+  main:
+    enabled: false
 
+# -- Configure persistence settings for the chart under this key.
+# @default -- See values.yaml
 persistence:
   config:
     enabled: false
-    emptyDir:
-      enabled: false
     mountPath: /var/www/html/storage
 
-# Enabled mariadb
-# ... for more options see https://github.com/bitnami/charts/tree/master/bitnami/mariadb
+# -- Enable and configure mariadb database subchart under this key.
+#    For more options see [mariadb chart documentation](https://github.com/bitnami/charts/tree/master/bitnami/mariadb)
+# @default -- See values.yaml
 mariadb:
   enabled: false
   architecture: standalone
diff --git a/charts/stable/mylar/Chart.yaml b/charts/stable/mylar/Chart.yaml
index 4f832244..db8fdc28 100644
--- a/charts/stable/mylar/Chart.yaml
+++ b/charts/stable/mylar/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: 0.4.9.5
+appVersion: version-v0.5.3
 description: Mylar is the automated Comic Book downloader (cbr/cbz) for use with various download clients.
 name: mylar
-version: 2.4.0
+version: 3.0.0
 kubeVersion: ">=1.16.0-0"
 keywords:
 - mylar
@@ -18,4 +18,4 @@ maintainers:
 dependencies:
 - name: common
   repository: https://library-charts.k8s-at-home.com
-  version: 2.5.0
+  version: 3.2.0
diff --git a/charts/stable/mylar/README.md b/charts/stable/mylar/README.md
index d524f6fc..a80e5360 100644
--- a/charts/stable/mylar/README.md
+++ b/charts/stable/mylar/README.md
@@ -1,6 +1,6 @@
 # mylar
 
-![Version: 2.4.0](https://img.shields.io/badge/Version-2.4.0-informational?style=flat-square) ![AppVersion: 0.4.9.5](https://img.shields.io/badge/AppVersion-0.4.9.5-informational?style=flat-square)
+![Version: 3.0.0](https://img.shields.io/badge/Version-3.0.0-informational?style=flat-square) ![AppVersion: version-v0.5.3](https://img.shields.io/badge/AppVersion-version--v0.5.3-informational?style=flat-square)
 
 Mylar is the automated Comic Book downloader (cbr/cbz) for use with various download clients.
 
@@ -20,7 +20,7 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://library-charts.k8s-at-home.com | common | 2.5.0 |
+| https://library-charts.k8s-at-home.com | common | 3.2.0 |
 
 ## TL;DR
 
@@ -77,21 +77,16 @@ N/A
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| env | object | `{}` |  |
-| image.pullPolicy | string | `"IfNotPresent"` |  |
-| image.repository | string | `"linuxserver/mylar3"` |  |
-| image.tag | string | `"v0.4.9.5-ls14"` |  |
-| ingress.enabled | bool | `false` |  |
-| persistence.comics.emptyDir.enabled | bool | `false` |  |
-| persistence.comics.enabled | bool | `false` |  |
-| persistence.comics.mountPath | string | `"/comics"` |  |
-| persistence.config.emptyDir.enabled | bool | `false` |  |
-| persistence.config.enabled | bool | `false` |  |
-| persistence.downloads.emptyDir.enabled | bool | `false` |  |
-| persistence.downloads.enabled | bool | `false` |  |
-| persistence.downloads.mountPath | string | `"/downloads"` |  |
-| service.port.port | int | `8090` |  |
-| strategy.type | string | `"Recreate"` |  |
+| env | object | See below | environment variables. See [image docs](https://docs.linuxserver.io/images/docker-mylar3#environment-variables-e) for more details. |
+| env.PGID | string | `"1000"` | Specify the group ID the application will run as |
+| env.PUID | string | `"1000"` | Specify the user ID the application will run as |
+| env.TZ | string | `"UTC"` | Set the container timezone |
+| image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
+| image.repository | string | `"ghcr.io/linuxserver/mylar3ghcr.io/linuxserver/mylar3"` | image repository |
+| image.tag | string | `"version-v0.5.3"` | image tag |
+| ingress.main | object | See values.yaml | Enable and configure ingress settings for the chart under this key. |
+| persistence | object | See values.yaml | Configure persistence settings for the chart under this key. |
+| service | object | See values.yaml | Configures service settings for the chart. |
 
 ## Changelog
 
@@ -99,6 +94,15 @@ 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).
 
+### [3.0.0]
+
+#### Changed
+
+- **BREAKING**: Upgraded the common library dependency to version 3.2.0. This introduces several breaking changes (`service`, `ingress` and `persistence` keys have been refactored).
+  Be sure to check out the [library chart](https://github.com/k8s-at-home/library-charts/blob/common-3.2.0/charts/stable/common/) for the up-to-date values.
+- Changed image repository to `ghcr.io/linuxserver/mylar3`.
+- Changed image tag to `version-v0.5.3`.
+
 ### [1.0.0]
 
 #### Added
@@ -113,7 +117,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - N/A
 
-[1.0.0]: #1.0.0
+[3.0.0]: #300
+[1.0.0]: #100
 
 ## Support
 
diff --git a/charts/stable/mylar/README_CHANGELOG.md.gotmpl b/charts/stable/mylar/README_CHANGELOG.md.gotmpl
index 457def03..2b77b411 100644
--- a/charts/stable/mylar/README_CHANGELOG.md.gotmpl
+++ b/charts/stable/mylar/README_CHANGELOG.md.gotmpl
@@ -9,6 +9,15 @@ 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).
 
+### [3.0.0]
+
+#### Changed
+
+- **BREAKING**: Upgraded the common library dependency to version 3.2.0. This introduces several breaking changes (`service`, `ingress` and `persistence` keys have been refactored).
+  Be sure to check out the [library chart](https://github.com/k8s-at-home/library-charts/blob/common-3.2.0/charts/stable/common/) for the up-to-date values.
+- Changed image repository to `ghcr.io/linuxserver/mylar3`.
+- Changed image tag to `version-v0.5.3`.
+
 ### [1.0.0]
 
 #### Added
@@ -23,5 +32,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - N/A
 
-[1.0.0]: #1.0.0
+[3.0.0]: #300
+[1.0.0]: #100
 {{- end -}}
diff --git a/charts/stable/mylar/values.yaml b/charts/stable/mylar/values.yaml
index 087223fd..9e27b825 100644
--- a/charts/stable/mylar/values.yaml
+++ b/charts/stable/mylar/values.yaml
@@ -6,38 +6,45 @@
 #
 
 image:
-  repository: linuxserver/mylar3
+  # -- image repository
+  repository: ghcr.io/linuxserver/mylar3
+  # -- image tag
+  tag: version-v0.5.3
+  # -- image pull policy
   pullPolicy: IfNotPresent
-  tag: v0.4.9.5-ls14
 
-strategy:
-  type: Recreate
-
-env: {}
-  # TZ:
-  # PUID:
-  # PGID:
-  # UMASK:
+# -- environment variables. See [image docs](https://docs.linuxserver.io/images/docker-mylar3#environment-variables-e) for more details.
+# @default -- See below
+env:
+  # -- Set the container timezone
+  TZ: UTC
+    # -- Specify the user ID the application will run as
+  PUID: "1000"
+  # -- Specify the group ID the application will run as
+  PGID: "1000"
 
+# -- Configures service settings for the chart.
+# @default -- See values.yaml
 service:
-  port:
-    port: 8090
+  main:
+    ports:
+      http:
+        port: 8090
 
 ingress:
-  enabled: false
+  # -- Enable and configure ingress settings for the chart under this key.
+  # @default -- See values.yaml
+  main:
+    enabled: false
 
+# -- Configure persistence settings for the chart under this key.
+# @default -- See values.yaml
 persistence:
   config:
     enabled: false
-    emptyDir:
-      enabled: false
   comics:
     enabled: false
-    emptyDir:
-      enabled: false
     mountPath: /comics
   downloads:
     enabled: false
-    emptyDir:
-      enabled: false
     mountPath: /downloads
diff --git a/charts/stable/navidrome/Chart.yaml b/charts/stable/navidrome/Chart.yaml
index 083cb96a..4a7c34bf 100644
--- a/charts/stable/navidrome/Chart.yaml
+++ b/charts/stable/navidrome/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: 0.39.0
+appVersion: 0.43.0
 description: Navidrome is an open source web-based music collection server and streamer
 name: navidrome
-version: 4.4.0
+version: 5.0.0
 kubeVersion: ">=1.16.0-0"
 keywords:
 - navidrome
@@ -19,4 +19,4 @@ maintainers:
 dependencies:
 - name: common
   repository: https://library-charts.k8s-at-home.com
-  version: 2.5.0
+  version: 3.2.0
diff --git a/charts/stable/navidrome/README.md b/charts/stable/navidrome/README.md
index 91742c25..5855bb5f 100644
--- a/charts/stable/navidrome/README.md
+++ b/charts/stable/navidrome/README.md
@@ -1,6 +1,6 @@
 # navidrome
 
-![Version: 4.4.0](https://img.shields.io/badge/Version-4.4.0-informational?style=flat-square) ![AppVersion: 0.39.0](https://img.shields.io/badge/AppVersion-0.39.0-informational?style=flat-square)
+![Version: 5.0.0](https://img.shields.io/badge/Version-5.0.0-informational?style=flat-square) ![AppVersion: 0.43.0](https://img.shields.io/badge/AppVersion-0.43.0-informational?style=flat-square)
 
 Navidrome is an open source web-based music collection server and streamer
 
@@ -19,7 +19,7 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://library-charts.k8s-at-home.com | common | 2.5.0 |
+| https://library-charts.k8s-at-home.com | common | 3.2.0 |
 
 ## TL;DR
 
@@ -76,25 +76,18 @@ N/A
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| env.ND_ENABLETRANSCODINGCONFIG | string | `"true"` |  |
-| env.ND_LOGLEVEL | string | `"info"` |  |
-| env.ND_MUSICFOLDER | string | `"/music"` |  |
-| env.ND_SCANINTERVAL | string | `"15m"` |  |
-| env.ND_SESSIONTIMEOUT | string | `"24h"` |  |
-| image.pullPolicy | string | `"IfNotPresent"` |  |
-| image.repository | string | `"deluan/navidrome"` |  |
-| image.tag | string | `"0.39.0"` |  |
-| ingress.enabled | bool | `false` |  |
-| persistence.config.accessMode | string | `"ReadWriteOnce"` |  |
-| persistence.config.emptyDir.enabled | bool | `false` |  |
-| persistence.config.enabled | bool | `false` |  |
-| persistence.config.mountPath | string | `"/data"` |  |
-| persistence.music.accessMode | string | `"ReadWriteOnce"` |  |
-| persistence.music.emptyDir.enabled | bool | `false` |  |
-| persistence.music.enabled | bool | `false` |  |
-| persistence.music.mountPath | string | `"/music"` |  |
-| service.port.port | int | `4533` |  |
-| strategy.type | string | `"Recreate"` |  |
+| env | object | See below | environment variables. See [navidrome docs](https://www.navidrome.org/docs/usage/configuration-options/#environment-variables) for more details. |
+| env.ND_ENABLETRANSCODINGCONFIG | string | `"true"` | Enables transcoding configuration in the UI |
+| env.ND_LOGLEVEL | string | `"info"` | Log level. Useful for troubleshooting. |
+| env.ND_MUSICFOLDER | string | `"/music"` | Folder where your music library is stored. |
+| env.ND_SESSIONTIMEOUT | string | `"24h"` | How long Navidrome will wait before closing web ui idle sessions |
+| env.TZ | string | `"UTC"` | Set the container timezone |
+| image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
+| image.repository | string | `"deluan/navidrome"` | image repository |
+| image.tag | string | `"0.43.0"` | image tag |
+| ingress.main | object | See values.yaml | Enable and configure ingress settings for the chart under this key. |
+| persistence | object | See values.yaml | Configure persistence settings for the chart under this key. |
+| service | object | See values.yaml | Configures service settings for the chart. |
 
 ## Changelog
 
@@ -102,6 +95,14 @@ 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).
 
+### [5.0.0]
+
+#### Changed
+
+- **BREAKING**: Upgraded the common library dependency to version 3.2.0. This introduces several breaking changes (`service`, `ingress` and `persistence` keys have been refactored).
+  Be sure to check out the [library chart](https://github.com/k8s-at-home/library-charts/blob/common-3.2.0/charts/stable/common/) for the up-to-date values.
+- Changed image tag to `0.43.0`.
+
 ### [1.0.0]
 
 #### Added
@@ -116,7 +117,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - N/A
 
-[1.0.0]: #1.0.0
+[5.0.0]: #500
+[1.0.0]: #100
 
 ## Support
 
diff --git a/charts/stable/navidrome/README_CHANGELOG.md.gotmpl b/charts/stable/navidrome/README_CHANGELOG.md.gotmpl
index 457def03..da326d41 100644
--- a/charts/stable/navidrome/README_CHANGELOG.md.gotmpl
+++ b/charts/stable/navidrome/README_CHANGELOG.md.gotmpl
@@ -9,6 +9,14 @@ 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).
 
+### [5.0.0]
+
+#### Changed
+
+- **BREAKING**: Upgraded the common library dependency to version 3.2.0. This introduces several breaking changes (`service`, `ingress` and `persistence` keys have been refactored).
+  Be sure to check out the [library chart](https://github.com/k8s-at-home/library-charts/blob/common-3.2.0/charts/stable/common/) for the up-to-date values.
+- Changed image tag to `0.43.0`.
+
 ### [1.0.0]
 
 #### Added
@@ -23,5 +31,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - N/A
 
-[1.0.0]: #1.0.0
+[5.0.0]: #500
+[1.0.0]: #100
 {{- end -}}
diff --git a/charts/stable/navidrome/values.yaml b/charts/stable/navidrome/values.yaml
index a50ef39c..230f6c99 100644
--- a/charts/stable/navidrome/values.yaml
+++ b/charts/stable/navidrome/values.yaml
@@ -6,61 +6,47 @@
 #
 
 image:
+  # -- image repository
   repository: deluan/navidrome
+  # -- image tag
+  tag: 0.43.0
+  # -- image pull policy
   pullPolicy: IfNotPresent
-  tag: 0.39.0
-
-strategy:
-  type: Recreate
 
+# -- environment variables. See [navidrome docs](https://www.navidrome.org/docs/usage/configuration-options/#environment-variables) for more details.
+# @default -- See below
 env:
-  ND_SCANINTERVAL: 15m
+  # -- Set the container timezone
+  TZ: UTC
+  # -- Log level. Useful for troubleshooting.
   ND_LOGLEVEL: info
+  # -- How long Navidrome will wait before closing web ui idle sessions
   ND_SESSIONTIMEOUT: 24h
+  # -- Enables transcoding configuration in the UI
   ND_ENABLETRANSCODINGCONFIG: "true"
+  # -- Folder where your music library is stored.
   ND_MUSICFOLDER: /music
 
+# -- Configures service settings for the chart.
+# @default -- See values.yaml
 service:
-  port:
-    port: 4533
+  main:
+    ports:
+      http:
+        port: 4533
 
 ingress:
-  enabled: false
+  # -- Enable and configure ingress settings for the chart under this key.
+  # @default -- See values.yaml
+  main:
+    enabled: false
 
+# -- Configure persistence settings for the chart under this key.
+# @default -- See values.yaml
 persistence:
   config:
     enabled: false
-    emptyDir:
-      enabled: false
     mountPath: /data
-    accessMode: ReadWriteOnce
-    ## 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: ""
   music:
     enabled: false
-    emptyDir:
-      enabled: false
     mountPath: /music
-    accessMode: ReadWriteOnce
-    ## 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: ""
diff --git a/charts/stable/neolink/Chart.yaml b/charts/stable/neolink/Chart.yaml
index 442e3d24..5351c887 100644
--- a/charts/stable/neolink/Chart.yaml
+++ b/charts/stable/neolink/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 0.3.0
 description: Neolink - RTSP bridge to Reolink IP cameras
 name: neolink
-version: 3.4.0
+version: 4.0.0
 kubeVersion: ">=1.16.0-0"
 keywords:
 - reolink
@@ -15,4 +15,4 @@ maintainers:
 dependencies:
 - name: common
   repository: https://library-charts.k8s-at-home.com
-  version: 2.5.0
+  version: 3.2.0
diff --git a/charts/stable/neolink/README.md b/charts/stable/neolink/README.md
index c9877f39..3064cfb9 100644
--- a/charts/stable/neolink/README.md
+++ b/charts/stable/neolink/README.md
@@ -1,6 +1,6 @@
 # neolink
 
-![Version: 3.4.0](https://img.shields.io/badge/Version-3.4.0-informational?style=flat-square) ![AppVersion: 0.3.0](https://img.shields.io/badge/AppVersion-0.3.0-informational?style=flat-square)
+![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square) ![AppVersion: 0.3.0](https://img.shields.io/badge/AppVersion-0.3.0-informational?style=flat-square)
 
 Neolink - RTSP bridge to Reolink IP cameras
 
@@ -18,7 +18,7 @@ Kubernetes: `>=1.16.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://library-charts.k8s-at-home.com | common | 2.5.0 |
+| https://library-charts.k8s-at-home.com | common | 3.2.0 |
 
 ## TL;DR
 
@@ -75,13 +75,12 @@ N/A
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| config | string | `"bind = \"0.0.0.0\"\n[[cameras]]\nname = \"driveway\"\nusername = \"admin\"\npassword = \"12345678\"\naddress = \"192.168.1.187:9000\"\n"` |  |
-| image.pullPolicy | string | `"IfNotPresent"` |  |
-| image.repository | string | `"thirtythreeforty/neolink"` |  |
-| image.tag | string | `"latest"` |  |
-| ingress.enabled | bool | `false` |  |
-| service.port.port | int | `8554` |  |
-| strategy.type | string | `"Recreate"` |  |
+| config | string | See values.yaml | Neolink configuration settings. See [application docs](https://github.com/thirtythreeforty/neolink/blob/master/sample_config.toml) for more details. |
+| image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
+| image.repository | string | `"thirtythreeforty/neolink"` | image repository |
+| image.tag | string | `"latest"` | image tag |
+| ingress.main | object | See values.yaml | Enable and configure ingress settings for the chart under this key. |
+| service | object | See values.yaml | Configures service settings for the chart. |
 
 ## Changelog
 
@@ -89,6 +88,13 @@ 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).
 
+### [4.0.0]
+
+#### Changed
+
+- **BREAKING**: Upgraded the common library dependency to version 3.2.0. This introduces several breaking changes (`service`, `ingress` and `persistence` keys have been refactored).
+  Be sure to check out the [library chart](https://github.com/k8s-at-home/library-charts/blob/common-3.2.0/charts/stable/common/) for the up-to-date values.
+
 ### [1.0.0]
 
 #### Added
@@ -103,7 +109,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - N/A
 
-[1.0.0]: #1.0.0
+[4.0.0]: #400
+[1.0.0]: #100
 
 ## Support
 
diff --git a/charts/stable/neolink/README_CHANGELOG.md.gotmpl b/charts/stable/neolink/README_CHANGELOG.md.gotmpl
index 457def03..17039dad 100644
--- a/charts/stable/neolink/README_CHANGELOG.md.gotmpl
+++ b/charts/stable/neolink/README_CHANGELOG.md.gotmpl
@@ -9,6 +9,13 @@ 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).
 
+### [4.0.0]
+
+#### Changed
+
+- **BREAKING**: Upgraded the common library dependency to version 3.2.0. This introduces several breaking changes (`service`, `ingress` and `persistence` keys have been refactored).
+  Be sure to check out the [library chart](https://github.com/k8s-at-home/library-charts/blob/common-3.2.0/charts/stable/common/) for the up-to-date values.
+
 ### [1.0.0]
 
 #### Added
@@ -23,5 +30,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - N/A
 
-[1.0.0]: #1.0.0
+[4.0.0]: #400
+[1.0.0]: #100
 {{- end -}}
diff --git a/charts/stable/neolink/templates/common.yaml b/charts/stable/neolink/templates/common.yaml
index b5a69205..0c1afa7e 100644
--- a/charts/stable/neolink/templates/common.yaml
+++ b/charts/stable/neolink/templates/common.yaml
@@ -1,31 +1,20 @@
+---
 {{/* Make sure all variables are set properly */}}
 {{- include "common.values.setup" . }}
 
-{{/* Append the configMap to the additionalVolumes */}}
-{{- define "neolink.configmap.volume" -}}
-name: neolink-settings
-configMap:
-  name: {{ template "common.names.fullname" . }}-settings
-{{- end -}}
-
-{{- $volume := include "neolink.configmap.volume" . | fromYaml -}}
-{{- if $volume -}}
-    {{- $additionalVolumes := append .Values.additionalVolumes $volume }}
-    {{- $_ := set .Values "additionalVolumes" (deepCopy $additionalVolumes) -}}
-{{- end -}}
-
-{{/* Append the configMap volume to the additionalVolumeMounts */}}
-{{- define "neolink.configmap.volumeMount" -}}
-name: neolink-settings
-mountPath: /etc/neolink.toml
-subPath: neolink.toml
-{{- end -}}
-
-{{- $volumeMount := include "neolink.configmap.volumeMount" . | fromYaml -}}
-{{- if $volumeMount -}}
-    {{- $additionalVolumeMounts := append .Values.additionalVolumeMounts $volumeMount }}
-    {{- $_ := set .Values "additionalVolumeMounts" (deepCopy $additionalVolumeMounts) -}}
+{{/* Append the hardcoded settings */}}
+{{- define "neolink.harcodedValues" -}}
+persistence:
+  neolink-settings:
+    enabled: "true"
+    mountPath: "/etc/neolink.toml"
+    subPath: "neolink.toml"
+    type: "custom"
+    volumeSpec:
+      configMap:
+        name: {{ printf "%v-settings" (include "common.names.fullname" .) }}
 {{- end -}}
+{{- $_ := mergeOverwrite .Values (include "neolink.harcodedValues" . | fromYaml) -}}
 
 {{/* Render the templates */}}
 {{ include "common.all" . }}
diff --git a/charts/stable/neolink/templates/configmap.yaml b/charts/stable/neolink/templates/configmap.yaml
index ea5417d1..c43e536c 100644
--- a/charts/stable/neolink/templates/configmap.yaml
+++ b/charts/stable/neolink/templates/configmap.yaml
@@ -1,11 +1,11 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ template "common.names.fullname" . }}-settings
+  name: {{ include "common.names.fullname" . }}-settings
   labels:
     {{- include "common.labels" . | nindent 4 }}
 data:
   neolink.toml:
-{{- with .Values.config }}
-    {{- toYaml . | nindent 4 }}
-{{- end }}
+    {{- with .Values.config }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
diff --git a/charts/stable/neolink/values.yaml b/charts/stable/neolink/values.yaml
index b7551749..fb739260 100644
--- a/charts/stable/neolink/values.yaml
+++ b/charts/stable/neolink/values.yaml
@@ -6,22 +6,29 @@
 #
 
 image:
+  # -- image repository
   repository: thirtythreeforty/neolink
-  pullPolicy: IfNotPresent
+  # -- image tag
   tag: latest
+  # -- image pull policy
+  pullPolicy: IfNotPresent
 
-strategy:
-  type: Recreate
-
+# -- Configures service settings for the chart.
+# @default -- See values.yaml
 service:
-  port:
-    port: 8554
+  main:
+    ports:
+      http:
+        port: 8554
 
 ingress:
-  enabled: false
+  # -- Enable and configure ingress settings for the chart under this key.
+  # @default -- See values.yaml
+  main:
+    enabled: false
 
-# Neolink configuration settings
-# https://github.com/thirtythreeforty/neolink/blob/master/sample_config.toml
+# -- Neolink configuration settings. See [application docs](https://github.com/thirtythreeforty/neolink/blob/master/sample_config.toml) for more details.
+# @default -- See values.yaml
 config: |
   bind = "0.0.0.0"
   [[cameras]]