From 78a15b266c26e171110811ff5fee3a83df2c1a0b Mon Sep 17 00:00:00 2001
From: Alex Lebens <alexanderlebens@gmail.com>
Date: Sun, 19 Apr 2026 21:03:44 -0500
Subject: [PATCH 1/5] feat: use helper

---
 .../cl01tl/helm/argocd/templates/_helpers.tpl | 14 ++++++++++
 .../argocd/templates/external-secret.yaml     | 10 +++----
 .../audiobookshelf/templates/_helpers.tpl     | 27 +++++++++++++++++++
 .../templates/external-secret.yaml            |  5 ++--
 .../templates/persistent-volume-claim.yaml    | 27 +++++++++----------
 .../templates/persistent-volume.yaml          | 21 +++++++--------
 .../helm/authentik/templates/_helpers.tpl     | 14 ++++++++++
 .../authentik/templates/external-secret.yaml  |  5 ++--
 .../helm/authentik/templates/ingress.yaml     |  7 +++--
 .../authentik/templates/reference-grant.yaml  |  5 ++--
 .../helm/backrest/templates/_helpers.tpl      | 24 +++++++++++++++++
 .../templates/persistent-volume-claim.yaml    | 18 ++++++-------
 .../backrest/templates/persistent-volume.yaml | 14 +++++-----
 .../cl01tl/helm/bazarr/templates/_helpers.tpl | 21 +++++++++++++++
 .../bazarr/templates/external-secret.yaml     |  5 ++--
 .../templates/persistent-volume-claim.yaml    |  7 +++--
 .../bazarr/templates/persistent-volume.yaml   |  7 +++--
 .../helm/cert-manager/templates/_helpers.tpl  | 24 +++++++++++++++++
 .../templates/cluster-issuer.yaml             |  9 +++----
 .../templates/external-secret.yaml            |  9 +++----
 .../cl01tl/helm/cilium/templates/_helpers.tpl | 14 ++++++++++
 .../templates/cilium-bgp-advertisement.yaml   |  5 ++--
 .../templates/cilium-bgp-cluster-config.yaml  |  5 ++--
 .../templates/cilium-bgp-peer-config.yaml     |  5 ++--
 .../cilium-load-balancer-ip-pool.yaml         | 10 +++----
 .../cl01tl/helm/cilium/templates/gateway.yaml |  5 ++--
 .../helm/cilium/templates/http-route.yaml     |  5 ++--
 .../helm/dawarich/templates/_helpers.tpl      | 14 ++++++++++
 .../dawarich/templates/external-secret.yaml   | 10 +++----
 29 files changed, 234 insertions(+), 112 deletions(-)
 create mode 100644 clusters/cl01tl/helm/argocd/templates/_helpers.tpl
 create mode 100644 clusters/cl01tl/helm/audiobookshelf/templates/_helpers.tpl
 create mode 100644 clusters/cl01tl/helm/authentik/templates/_helpers.tpl
 create mode 100644 clusters/cl01tl/helm/backrest/templates/_helpers.tpl
 create mode 100644 clusters/cl01tl/helm/bazarr/templates/_helpers.tpl
 create mode 100644 clusters/cl01tl/helm/cert-manager/templates/_helpers.tpl
 create mode 100644 clusters/cl01tl/helm/cilium/templates/_helpers.tpl
 create mode 100644 clusters/cl01tl/helm/dawarich/templates/_helpers.tpl

diff --git a/clusters/cl01tl/helm/argocd/templates/_helpers.tpl b/clusters/cl01tl/helm/argocd/templates/_helpers.tpl
new file mode 100644
index 000000000..251852577
--- /dev/null
+++ b/clusters/cl01tl/helm/argocd/templates/_helpers.tpl
@@ -0,0 +1,14 @@
+{{/*
+Common labels
+*/}}
+{{- define "argocd.labels" -}}
+{{ include "argocd.selectorLabels" $ }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "argocd.selectorLabels" -}}
+app.kubernetes.io/instance: {{ .Release.Name }}
+app.kubernetes.io/part-of: {{ .Release.Name }}
+{{- end }}
diff --git a/clusters/cl01tl/helm/argocd/templates/external-secret.yaml b/clusters/cl01tl/helm/argocd/templates/external-secret.yaml
index c44d04109..8626fb963 100644
--- a/clusters/cl01tl/helm/argocd/templates/external-secret.yaml
+++ b/clusters/cl01tl/helm/argocd/templates/external-secret.yaml
@@ -4,9 +4,8 @@ metadata:
   name: argocd-oidc-authentik
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Template.Name }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: argocd-oidc-authentik
+    {{- include "argocd.labels" . | nindent 4 }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
@@ -28,9 +27,8 @@ metadata:
   name: argocd-notifications-ntfy
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Template.Name }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: argocd-notifications-ntfy
+    {{- include "argocd.labels" . | nindent 4 }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
diff --git a/clusters/cl01tl/helm/audiobookshelf/templates/_helpers.tpl b/clusters/cl01tl/helm/audiobookshelf/templates/_helpers.tpl
new file mode 100644
index 000000000..fafc16ec0
--- /dev/null
+++ b/clusters/cl01tl/helm/audiobookshelf/templates/_helpers.tpl
@@ -0,0 +1,27 @@
+{{/*
+Common labels
+*/}}
+{{- define "audiobookshelf.labels" -}}
+{{ include "audiobookshelf.selectorLabels" $ }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "audiobookshelf.selectorLabels" -}}
+app.kubernetes.io/instance: {{ .Release.Name }}
+app.kubernetes.io/part-of: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+NFS names
+*/}}
+{{- define "audiobookshelf.booksNfsName" -}}
+audiobookshelf-books-nfs-storage
+{{- end -}}
+{{- define "audiobookshelf.audiobooksNfsName" -}}
+audiobookshelf-audiobooks-nfs-storage
+{{- end -}}
+{{- define "audiobookshelf.podcastsNfsName" -}}
+audiobookshelf-podcasts-nfs-storage
+{{- end -}}
diff --git a/clusters/cl01tl/helm/audiobookshelf/templates/external-secret.yaml b/clusters/cl01tl/helm/audiobookshelf/templates/external-secret.yaml
index a7a93d4fa..d82c2ad62 100644
--- a/clusters/cl01tl/helm/audiobookshelf/templates/external-secret.yaml
+++ b/clusters/cl01tl/helm/audiobookshelf/templates/external-secret.yaml
@@ -4,9 +4,8 @@ metadata:
   name: audiobookshelf-config-apprise
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Template.Name }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: audiobookshelf-config-apprise
+    {{- include "audiobookshelf.labels" . | nindent 4 }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
diff --git a/clusters/cl01tl/helm/audiobookshelf/templates/persistent-volume-claim.yaml b/clusters/cl01tl/helm/audiobookshelf/templates/persistent-volume-claim.yaml
index 46fc79075..1aeef0cb8 100644
--- a/clusters/cl01tl/helm/audiobookshelf/templates/persistent-volume-claim.yaml
+++ b/clusters/cl01tl/helm/audiobookshelf/templates/persistent-volume-claim.yaml
@@ -1,14 +1,13 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: audiobookshelf-books-nfs-storage
+  name: {{- include "audiobookshelf.booksNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Template.Name }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: {{- include "audiobookshelf.booksNfsName" . }}
+    {{- include "audiobookshelf.labels" . | nindent 4 }}
 spec:
-  volumeName: {{ .Template.Name }}
+  volumeName: {{- include "audiobookshelf.booksNfsName" . }}
   storageClassName: nfs-client
   accessModes:
     - ReadWriteMany
@@ -20,14 +19,13 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: audiobookshelf-audiobooks-nfs-storage
+  name: {{- include "audiobookshelf.audiobooksNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Template.Name }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: {{- include "audiobookshelf.audiobooksNfsName" . }}
+    {{- include "audiobookshelf.labels" . | nindent 4 }}
 spec:
-  volumeName: {{ .Template.Name }}
+  volumeName: {{- include "audiobookshelf.audiobooksNfsName" . }}
   storageClassName: nfs-client
   accessModes:
     - ReadWriteMany
@@ -39,14 +37,13 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: audiobookshelf-podcasts-nfs-storage
+  name: {{- include "audiobookshelf.podcastsNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Template.Name }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: {{- include "audiobookshelf.podcastsNfsName" . }}
+    {{- include "audiobookshelf.labels" . | nindent 4 }}
 spec:
-  volumeName: {{ .Template.Name }}
+  volumeName: {{- include "audiobookshelf.podcastsNfsName" . }}
   storageClassName: nfs-client
   accessModes:
     - ReadWriteMany
diff --git a/clusters/cl01tl/helm/audiobookshelf/templates/persistent-volume.yaml b/clusters/cl01tl/helm/audiobookshelf/templates/persistent-volume.yaml
index c26aa31d0..e6a4e3467 100644
--- a/clusters/cl01tl/helm/audiobookshelf/templates/persistent-volume.yaml
+++ b/clusters/cl01tl/helm/audiobookshelf/templates/persistent-volume.yaml
@@ -1,12 +1,11 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: audiobookshelf-books-nfs-storage
+  name: {{- include "audiobookshelf.booksNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Template.Name }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: {{- include "audiobookshelf.booksNfsName" . }}
+    {{- include "audiobookshelf.labels" . | nindent 4 }}
 spec:
   persistentVolumeReclaimPolicy: Retain
   storageClassName: nfs-client
@@ -26,12 +25,11 @@ spec:
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: audiobookshelf-audiobooks-nfs-storage
+  name: {{- include "audiobookshelf.audiobooksNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Template.Name }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: {{- include "audiobookshelf.audiobooksNfsName" . }}
+    {{- include "audiobookshelf.labels" . | nindent 4 }}
 spec:
   persistentVolumeReclaimPolicy: Retain
   storageClassName: nfs-client
@@ -51,12 +49,11 @@ spec:
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: audiobookshelf-podcasts-nfs-storage
+  name: {{- include "audiobookshelf.podcastsNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Template.Name }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: {{- include "audiobookshelf.podcastsNfsName" . }}
+    {{- include "audiobookshelf.labels" . | nindent 4 }}
 spec:
   persistentVolumeReclaimPolicy: Retain
   storageClassName: nfs-client
diff --git a/clusters/cl01tl/helm/authentik/templates/_helpers.tpl b/clusters/cl01tl/helm/authentik/templates/_helpers.tpl
new file mode 100644
index 000000000..523f2ccb7
--- /dev/null
+++ b/clusters/cl01tl/helm/authentik/templates/_helpers.tpl
@@ -0,0 +1,14 @@
+{{/*
+Common labels
+*/}}
+{{- define "authentik.labels" -}}
+{{ include "authentik.selectorLabels" $ }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "authentik.selectorLabels" -}}
+app.kubernetes.io/instance: {{ .Release.Name }}
+app.kubernetes.io/part-of: {{ .Release.Name }}
+{{- end }}
diff --git a/clusters/cl01tl/helm/authentik/templates/external-secret.yaml b/clusters/cl01tl/helm/authentik/templates/external-secret.yaml
index 4249d3536..7d2fa7041 100644
--- a/clusters/cl01tl/helm/authentik/templates/external-secret.yaml
+++ b/clusters/cl01tl/helm/authentik/templates/external-secret.yaml
@@ -4,9 +4,8 @@ metadata:
   name: authentik-key
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Template.Name }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: authentik-key
+    {{- include "authentik.labels" . | nindent 4 }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
diff --git a/clusters/cl01tl/helm/authentik/templates/ingress.yaml b/clusters/cl01tl/helm/authentik/templates/ingress.yaml
index 2e8da1298..b16db26c5 100644
--- a/clusters/cl01tl/helm/authentik/templates/ingress.yaml
+++ b/clusters/cl01tl/helm/authentik/templates/ingress.yaml
@@ -1,13 +1,12 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: authentik-tailscale
+  name: {{ .Release.Name }}-tailscale
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Template.Name }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ .Release.Name }}-tailscale
     tailscale.com/proxy-class: no-metrics
+    {{- include "authentik.labels" . | nindent 4 }}
   annotations:
     tailscale.com/experimental-forward-cluster-traffic-via-ingress: "true"
 spec:
diff --git a/clusters/cl01tl/helm/authentik/templates/reference-grant.yaml b/clusters/cl01tl/helm/authentik/templates/reference-grant.yaml
index b182dd3f0..b03d840fb 100644
--- a/clusters/cl01tl/helm/authentik/templates/reference-grant.yaml
+++ b/clusters/cl01tl/helm/authentik/templates/reference-grant.yaml
@@ -4,9 +4,8 @@ metadata:
   name: allow-outpost-cross-namespace-access
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Template.Name }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: allow-outpost-cross-namespace-access
+    {{- include "authentik.labels" . | nindent 4 }}
 spec:
   from:
     - group: gateway.networking.k8s.io
diff --git a/clusters/cl01tl/helm/backrest/templates/_helpers.tpl b/clusters/cl01tl/helm/backrest/templates/_helpers.tpl
new file mode 100644
index 000000000..13cb540f8
--- /dev/null
+++ b/clusters/cl01tl/helm/backrest/templates/_helpers.tpl
@@ -0,0 +1,24 @@
+{{/*
+Common labels
+*/}}
+{{- define "backrest.labels" -}}
+{{ include "backrest.selectorLabels" $ }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "backrest.selectorLabels" -}}
+app.kubernetes.io/instance: {{ .Release.Name }}
+app.kubernetes.io/part-of: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+NFS names
+*/}}
+{{- define "backrest.storageNfsName" -}}
+backrest-nfs-storage
+{{- end -}}
+{{- define "backrest.shareNfsName" -}}
+backrest-nfs-share
+{{- end -}}
diff --git a/clusters/cl01tl/helm/backrest/templates/persistent-volume-claim.yaml b/clusters/cl01tl/helm/backrest/templates/persistent-volume-claim.yaml
index 81dbaea9a..30ec73aa5 100644
--- a/clusters/cl01tl/helm/backrest/templates/persistent-volume-claim.yaml
+++ b/clusters/cl01tl/helm/backrest/templates/persistent-volume-claim.yaml
@@ -1,14 +1,13 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: backrest-nfs-storage
+  name: {{- include "backrest.storageNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Template.Name }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: {{- include "backrest.storageNfsName" . }}
+    {{- include "backrest.labels" . | nindent 4 }}
 spec:
-  volumeName: {{ .Template.Name }}
+  volumeName: {{- include "backrest.storageNfsName" . }}
   storageClassName: nfs-client
   accessModes:
     - ReadWriteMany
@@ -20,14 +19,13 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: backrest-nfs-share
+  name: {{- include "backrest.shareNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Template.Name }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: {{- include "backrest.shareNfsName" . }}
+    {{- include "backrest.labels" . | nindent 4 }}
 spec:
-  volumeName: {{ .Template.Name }}
+  volumeName: {{- include "backrest.shareNfsName" . }}
   storageClassName: nfs-client
   accessModes:
     - ReadWriteMany
diff --git a/clusters/cl01tl/helm/backrest/templates/persistent-volume.yaml b/clusters/cl01tl/helm/backrest/templates/persistent-volume.yaml
index 7d7fc09ad..d1f889f7a 100644
--- a/clusters/cl01tl/helm/backrest/templates/persistent-volume.yaml
+++ b/clusters/cl01tl/helm/backrest/templates/persistent-volume.yaml
@@ -1,12 +1,11 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: backrest-nfs-storage
+  name: {{- include "backrest.storageNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Template.Name }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: {{- include "backrest.storageNfsName" . }}
+    {{- include "backrest.labels" . | nindent 4 }}
 spec:
   persistentVolumeReclaimPolicy: Retain
   storageClassName: nfs-client
@@ -26,12 +25,11 @@ spec:
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: backrest-nfs-share
+  name: {{- include "backrest.shareNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Template.Name }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: {{- include "backrest.shareNfsName" . }}
+    {{- include "backrest.labels" . | nindent 4 }}
 spec:
   persistentVolumeReclaimPolicy: Retain
   storageClassName: nfs-client
diff --git a/clusters/cl01tl/helm/bazarr/templates/_helpers.tpl b/clusters/cl01tl/helm/bazarr/templates/_helpers.tpl
new file mode 100644
index 000000000..b86c452c0
--- /dev/null
+++ b/clusters/cl01tl/helm/bazarr/templates/_helpers.tpl
@@ -0,0 +1,21 @@
+{{/*
+Common labels
+*/}}
+{{- define "bazarr.labels" -}}
+{{ include "bazarr.selectorLabels" $ }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "bazarr.selectorLabels" -}}
+app.kubernetes.io/instance: {{ .Release.Name }}
+app.kubernetes.io/part-of: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+NFS names
+*/}}
+{{- define "bazarr.storageNfsName" -}}
+bazarr-nfs-storage
+{{- end -}}
diff --git a/clusters/cl01tl/helm/bazarr/templates/external-secret.yaml b/clusters/cl01tl/helm/bazarr/templates/external-secret.yaml
index 70b4100e8..b2421d884 100644
--- a/clusters/cl01tl/helm/bazarr/templates/external-secret.yaml
+++ b/clusters/cl01tl/helm/bazarr/templates/external-secret.yaml
@@ -4,9 +4,8 @@ metadata:
   name: bazarr-key
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Template.Name }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: bazarr-key
+    {{- include "bazarr.labels" . | nindent 4 }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
diff --git a/clusters/cl01tl/helm/bazarr/templates/persistent-volume-claim.yaml b/clusters/cl01tl/helm/bazarr/templates/persistent-volume-claim.yaml
index 017540c01..a71736ef3 100644
--- a/clusters/cl01tl/helm/bazarr/templates/persistent-volume-claim.yaml
+++ b/clusters/cl01tl/helm/bazarr/templates/persistent-volume-claim.yaml
@@ -1,12 +1,11 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: bazarr-nfs-storage
+  name: {{- include "bazarr.storageNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Template.Name }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: {{- include "bazarr.storageNfsName" . }}
+    {{- include "bazarr.labels" . | nindent 4 }}
 spec:
   volumeName: {{ .Template.Name }}
   storageClassName: nfs-client
diff --git a/clusters/cl01tl/helm/bazarr/templates/persistent-volume.yaml b/clusters/cl01tl/helm/bazarr/templates/persistent-volume.yaml
index c608b11da..2021b4a6d 100644
--- a/clusters/cl01tl/helm/bazarr/templates/persistent-volume.yaml
+++ b/clusters/cl01tl/helm/bazarr/templates/persistent-volume.yaml
@@ -1,12 +1,11 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: bazarr-nfs-storage
+  name: {{- include "bazarr.storageNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Template.Name }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: {{- include "bazarr.storageNfsName" . }}
+    {{- include "bazarr.labels" . | nindent 4 }}
 spec:
   persistentVolumeReclaimPolicy: Retain
   storageClassName: nfs-client
diff --git a/clusters/cl01tl/helm/cert-manager/templates/_helpers.tpl b/clusters/cl01tl/helm/cert-manager/templates/_helpers.tpl
new file mode 100644
index 000000000..fd08bb911
--- /dev/null
+++ b/clusters/cl01tl/helm/cert-manager/templates/_helpers.tpl
@@ -0,0 +1,24 @@
+{{/*
+Common labels
+*/}}
+{{- define "cert-manager.labels" -}}
+{{ include "cert-manager.selectorLabels" $ }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "cert-manager.selectorLabels" -}}
+app.kubernetes.io/instance: {{ .Release.Name }}
+app.kubernetes.io/part-of: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+NFS names
+*/}}
+{{- define "cert-manager.cloudflareSecretName" -}}
+cert-manager-cloudflare-api-token
+{{- end -}}
+{{- define "cert-manager.cloudflareSecretKey" -}}
+api-token
+{{- end -}}
diff --git a/clusters/cl01tl/helm/cert-manager/templates/cluster-issuer.yaml b/clusters/cl01tl/helm/cert-manager/templates/cluster-issuer.yaml
index d1baf3b38..73587a621 100644
--- a/clusters/cl01tl/helm/cert-manager/templates/cluster-issuer.yaml
+++ b/clusters/cl01tl/helm/cert-manager/templates/cluster-issuer.yaml
@@ -4,9 +4,8 @@ metadata:
   name: letsencrypt-issuer
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Template.Name }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: letsencrypt-issuer
+    {{- include "cert-manager.labels" . | nindent 4 }}
 spec:
   acme:
     email: alexanderlebens@gmail.com
@@ -22,5 +21,5 @@ spec:
           cloudflare:
             email: alexanderlebens@gmail.com
             apiTokenSecretRef:
-              name: cloudflare-api-token
-              key: api-token
+              name: {{- include "cert-manager.cloudflareSecretName" . }}
+              key: {{- include "cert-manager.cloudflareSecretKey" . }}
diff --git a/clusters/cl01tl/helm/cert-manager/templates/external-secret.yaml b/clusters/cl01tl/helm/cert-manager/templates/external-secret.yaml
index 821e314a0..ab52d7d52 100644
--- a/clusters/cl01tl/helm/cert-manager/templates/external-secret.yaml
+++ b/clusters/cl01tl/helm/cert-manager/templates/external-secret.yaml
@@ -1,18 +1,17 @@
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: cloudflare-api-token
+  name: {{- include "cert-manager.cloudflareSecretName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Template.Name }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: {{- include "cert-manager.cloudflareSecretName" . }}
+    {{- include "cert-manager.labels" . | nindent 4 }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
     name: openbao
   data:
-    - secretKey: api-token
+    - secretKey: {{- include "cert-manager.cloudflareSecretKey" . }}
       remoteRef:
         key: /cloudflare/alexlebens.net/cl01tl-issuer-certificate
         property: token
diff --git a/clusters/cl01tl/helm/cilium/templates/_helpers.tpl b/clusters/cl01tl/helm/cilium/templates/_helpers.tpl
new file mode 100644
index 000000000..4a67642f9
--- /dev/null
+++ b/clusters/cl01tl/helm/cilium/templates/_helpers.tpl
@@ -0,0 +1,14 @@
+{{/*
+Common labels
+*/}}
+{{- define "cilium.labels" -}}
+{{ include "cilium.selectorLabels" $ }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "cilium.selectorLabels" -}}
+app.kubernetes.io/instance: {{ .Release.Name }}
+app.kubernetes.io/part-of: {{ .Release.Name }}
+{{- end }}
diff --git a/clusters/cl01tl/helm/cilium/templates/cilium-bgp-advertisement.yaml b/clusters/cl01tl/helm/cilium/templates/cilium-bgp-advertisement.yaml
index 79e4a752c..5d3c07756 100644
--- a/clusters/cl01tl/helm/cilium/templates/cilium-bgp-advertisement.yaml
+++ b/clusters/cl01tl/helm/cilium/templates/cilium-bgp-advertisement.yaml
@@ -4,9 +4,8 @@
 #   name: cilium-bgp-advertisements
 #   namespace: {{ .Release.Namespace }}
 #   labels:
-#     app.kubernetes.io/name: {{ .Template.Name }}
-#     app.kubernetes.io/instance: {{ .Release.Name }}
-#     app.kubernetes.io/part-of: {{ .Release.Name }}
+#     app.kubernetes.io/name: cilium-bgp-advertisements
+#     {{- include "cilium.labels" . | nindent 4 }}
 # spec:
 #   advertisements:
 #     - advertisementType: "Service"
diff --git a/clusters/cl01tl/helm/cilium/templates/cilium-bgp-cluster-config.yaml b/clusters/cl01tl/helm/cilium/templates/cilium-bgp-cluster-config.yaml
index 2324072d1..2d51255f9 100644
--- a/clusters/cl01tl/helm/cilium/templates/cilium-bgp-cluster-config.yaml
+++ b/clusters/cl01tl/helm/cilium/templates/cilium-bgp-cluster-config.yaml
@@ -4,9 +4,8 @@
 #   name: cilium-bgp
 #   namespace: {{ .Release.Namespace }}
 #   labels:
-#     app.kubernetes.io/name: {{ .Template.Name }}
-#     app.kubernetes.io/instance: {{ .Release.Name }}
-#     app.kubernetes.io/part-of: {{ .Release.Name }}
+#     app.kubernetes.io/name: cilium-bgp
+#     {{- include "cilium.labels" . | nindent 4 }}
 # spec:
 #   nodeSelector:
 #     matchLabels:
diff --git a/clusters/cl01tl/helm/cilium/templates/cilium-bgp-peer-config.yaml b/clusters/cl01tl/helm/cilium/templates/cilium-bgp-peer-config.yaml
index bc2200e01..a9fbb4d0d 100644
--- a/clusters/cl01tl/helm/cilium/templates/cilium-bgp-peer-config.yaml
+++ b/clusters/cl01tl/helm/cilium/templates/cilium-bgp-peer-config.yaml
@@ -4,9 +4,8 @@
 #   name: cilium-peer
 #   namespace: {{ .Release.Namespace }}
 #   labels:
-#     app.kubernetes.io/name: {{ .Template.Name }}
-#     app.kubernetes.io/instance: {{ .Release.Name }}
-#     app.kubernetes.io/part-of: {{ .Release.Name }}
+#     app.kubernetes.io/name: cilium-peer
+#     {{- include "cilium.labels" . | nindent 4 }}
 # spec:
 #   timers:
 #     holdTimeSeconds: 9
diff --git a/clusters/cl01tl/helm/cilium/templates/cilium-load-balancer-ip-pool.yaml b/clusters/cl01tl/helm/cilium/templates/cilium-load-balancer-ip-pool.yaml
index e4b522773..a3b8a2917 100644
--- a/clusters/cl01tl/helm/cilium/templates/cilium-load-balancer-ip-pool.yaml
+++ b/clusters/cl01tl/helm/cilium/templates/cilium-load-balancer-ip-pool.yaml
@@ -4,9 +4,8 @@ metadata:
   name: default-ip-pool
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Template.Name }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: default-ip-pool
+    {{- include "cilium.labels" . | nindent 4 }}
 spec:
   blocks:
     - start: "10.232.1.21"
@@ -19,9 +18,8 @@ metadata:
   name: bgp-ip-pool
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Template.Name }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: bgp-ip-pool
+    {{- include "cilium.labels" . | nindent 4 }}
 spec:
   blocks:
     - start: "10.232.2.100"
diff --git a/clusters/cl01tl/helm/cilium/templates/gateway.yaml b/clusters/cl01tl/helm/cilium/templates/gateway.yaml
index 149a03974..75954e77f 100644
--- a/clusters/cl01tl/helm/cilium/templates/gateway.yaml
+++ b/clusters/cl01tl/helm/cilium/templates/gateway.yaml
@@ -4,9 +4,8 @@
 #   name: cilium-tls-gateway
 #   namespace: {{ .Release.Namespace }}
 #   labels:
-#     app.kubernetes.io/name: {{ .Template.Name }}
-#     app.kubernetes.io/instance: {{ .Release.Name }}
-#     app.kubernetes.io/part-of: {{ .Release.Name }}
+#     app.kubernetes.io/name: cilium-tls-gateway
+#     {{- include "cilium.labels" . | nindent 4 }}
 #   annotations:
 #     cert-manager.io/cluster-issuer: letsencrypt-issuer
 # spec:
diff --git a/clusters/cl01tl/helm/cilium/templates/http-route.yaml b/clusters/cl01tl/helm/cilium/templates/http-route.yaml
index 8c7d8a845..f2e951592 100644
--- a/clusters/cl01tl/helm/cilium/templates/http-route.yaml
+++ b/clusters/cl01tl/helm/cilium/templates/http-route.yaml
@@ -4,9 +4,8 @@ metadata:
   name: hubble
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Template.Name }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: hubble
+    {{- include "cilium.labels" . | nindent 4 }}
 spec:
   parentRefs:
     - group: gateway.networking.k8s.io
diff --git a/clusters/cl01tl/helm/dawarich/templates/_helpers.tpl b/clusters/cl01tl/helm/dawarich/templates/_helpers.tpl
new file mode 100644
index 000000000..fd1b5cc89
--- /dev/null
+++ b/clusters/cl01tl/helm/dawarich/templates/_helpers.tpl
@@ -0,0 +1,14 @@
+{{/*
+Common labels
+*/}}
+{{- define "dawarich.labels" -}}
+{{ include "dawarich.selectorLabels" $ }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "dawarich.selectorLabels" -}}
+app.kubernetes.io/instance: {{ .Release.Name }}
+app.kubernetes.io/part-of: {{ .Release.Name }}
+{{- end }}
diff --git a/clusters/cl01tl/helm/dawarich/templates/external-secret.yaml b/clusters/cl01tl/helm/dawarich/templates/external-secret.yaml
index c5be43732..924a8baa5 100644
--- a/clusters/cl01tl/helm/dawarich/templates/external-secret.yaml
+++ b/clusters/cl01tl/helm/dawarich/templates/external-secret.yaml
@@ -4,9 +4,8 @@ metadata:
   name: dawarich-key
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Template.Name }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: dawarich-key
+    {{- include "dawarich.labels" . | nindent 4 }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
@@ -24,9 +23,8 @@ metadata:
   name: dawarich-oidc-authentik
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Template.Name }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: dawarich-oidc-authentik
+    {{- include "dawarich.labels" . | nindent 4 }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore

From e10689c5e53a3afc9aad9edfae3e0ce5c00d80bd Mon Sep 17 00:00:00 2001
From: Alex Lebens <alexanderlebens@gmail.com>
Date: Sun, 19 Apr 2026 21:08:59 -0500
Subject: [PATCH 2/5] feat: remove commented files

---
 .../templates/cilium-bgp-advertisement.yaml   | 18 --------
 .../templates/cilium-bgp-cluster-config.yaml  | 21 ---------
 .../templates/cilium-bgp-peer-config.yaml     | 22 ----------
 .../cl01tl/helm/cilium/templates/gateway.yaml | 44 -------------------
 4 files changed, 105 deletions(-)
 delete mode 100644 clusters/cl01tl/helm/cilium/templates/cilium-bgp-advertisement.yaml
 delete mode 100644 clusters/cl01tl/helm/cilium/templates/cilium-bgp-cluster-config.yaml
 delete mode 100644 clusters/cl01tl/helm/cilium/templates/cilium-bgp-peer-config.yaml
 delete mode 100644 clusters/cl01tl/helm/cilium/templates/gateway.yaml

diff --git a/clusters/cl01tl/helm/cilium/templates/cilium-bgp-advertisement.yaml b/clusters/cl01tl/helm/cilium/templates/cilium-bgp-advertisement.yaml
deleted file mode 100644
index 5d3c07756..000000000
--- a/clusters/cl01tl/helm/cilium/templates/cilium-bgp-advertisement.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# apiVersion: cilium.io/v2
-# kind: CiliumBGPAdvertisement
-# metadata:
-#   name: cilium-bgp-advertisements
-#   namespace: {{ .Release.Namespace }}
-#   labels:
-#     app.kubernetes.io/name: cilium-bgp-advertisements
-#     {{- include "cilium.labels" . | nindent 4 }}
-# spec:
-#   advertisements:
-#     - advertisementType: "Service"
-#       service:
-#         addresses:
-#           - ExternalIP
-#           - LoadBalancerIP
-#       selector:
-#         matchExpressions:
-#          - {key: somekey, operator: NotIn, values: ['never-used-value']}
diff --git a/clusters/cl01tl/helm/cilium/templates/cilium-bgp-cluster-config.yaml b/clusters/cl01tl/helm/cilium/templates/cilium-bgp-cluster-config.yaml
deleted file mode 100644
index 2d51255f9..000000000
--- a/clusters/cl01tl/helm/cilium/templates/cilium-bgp-cluster-config.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-# apiVersion: cilium.io/v2
-# kind: CiliumBGPClusterConfig
-# metadata:
-#   name: cilium-bgp
-#   namespace: {{ .Release.Namespace }}
-#   labels:
-#     app.kubernetes.io/name: cilium-bgp
-#     {{- include "cilium.labels" . | nindent 4 }}
-# spec:
-#   nodeSelector:
-#     matchLabels:
-#       node-role.kubernetes.io/bgp: "65020"
-#   bgpInstances:
-#     - name: "65020"
-#       localASN: 65020
-#       peers:
-#         - name: "udm-65000"
-#           peerASN: 65000
-#           peerAddress: 192.168.1.1
-#           peerConfigRef:
-#             name: "cilium-peer"
diff --git a/clusters/cl01tl/helm/cilium/templates/cilium-bgp-peer-config.yaml b/clusters/cl01tl/helm/cilium/templates/cilium-bgp-peer-config.yaml
deleted file mode 100644
index a9fbb4d0d..000000000
--- a/clusters/cl01tl/helm/cilium/templates/cilium-bgp-peer-config.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# apiVersion: cilium.io/v2
-# kind: CiliumBGPPeerConfig
-# metadata:
-#   name: cilium-peer
-#   namespace: {{ .Release.Namespace }}
-#   labels:
-#     app.kubernetes.io/name: cilium-peer
-#     {{- include "cilium.labels" . | nindent 4 }}
-# spec:
-#   timers:
-#     holdTimeSeconds: 9
-#     keepAliveTimeSeconds: 3
-#   ebgpMultihop: 4
-#   gracefulRestart:
-#     enabled: true
-#     restartTimeSeconds: 15
-#   families:
-#     - afi: ipv4
-#       safi: unicast
-#       advertisements:
-#         matchLabels:
-#           app.kubernetes.io/name: cilium-bgp-advertisements
diff --git a/clusters/cl01tl/helm/cilium/templates/gateway.yaml b/clusters/cl01tl/helm/cilium/templates/gateway.yaml
deleted file mode 100644
index 75954e77f..000000000
--- a/clusters/cl01tl/helm/cilium/templates/gateway.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-# apiVersion: gateway.networking.k8s.io/v1
-# kind: Gateway
-# metadata:
-#   name: cilium-tls-gateway
-#   namespace: {{ .Release.Namespace }}
-#   labels:
-#     app.kubernetes.io/name: cilium-tls-gateway
-#     {{- include "cilium.labels" . | nindent 4 }}
-#   annotations:
-#     cert-manager.io/cluster-issuer: letsencrypt-issuer
-# spec:
-#   addresses:
-#     - type: IPAddress
-#       value: 10.232.1.23
-#   gatewayClassName: cilium
-#   listeners:
-#     - allowedRoutes:
-#         namespaces:
-#           from: All
-#       hostname: '*.alexlebens.net'
-#       name: https
-#       port: 443
-#       protocol: HTTPS
-#       tls:
-#         certificateRefs:
-#           - group: ''
-#             kind: Secret
-#             name: https-gateway-cert
-#             namespace: kube-system
-#         mode: Terminate
-#     - allowedRoutes:
-#         namespaces:
-#           from: All
-#       hostname: 'alexlebens.net'
-#       name: https-domain
-#       port: 443
-#       protocol: HTTPS
-#       tls:
-#         certificateRefs:
-#           - group: ''
-#             kind: Secret
-#             name: https-gateway-cert
-#             namespace: kube-system
-#         mode: Terminate

From 3fef47cdf0aee0971d9597a1fdec4331a4acb470 Mon Sep 17 00:00:00 2001
From: Alex Lebens <alexanderlebens@gmail.com>
Date: Mon, 20 Apr 2026 15:02:21 -0500
Subject: [PATCH 3/5] fix: wrong mapping

---
 .../templates/persistent-volume-claim.yaml    | 20 +++++++++----------
 .../templates/persistent-volume.yaml          | 12 +++++------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/clusters/cl01tl/helm/audiobookshelf/templates/persistent-volume-claim.yaml b/clusters/cl01tl/helm/audiobookshelf/templates/persistent-volume-claim.yaml
index 1aeef0cb8..2edf51afe 100644
--- a/clusters/cl01tl/helm/audiobookshelf/templates/persistent-volume-claim.yaml
+++ b/clusters/cl01tl/helm/audiobookshelf/templates/persistent-volume-claim.yaml
@@ -1,13 +1,13 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{- include "audiobookshelf.booksNfsName" . }}
+  name: {{ include "audiobookshelf.booksNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{- include "audiobookshelf.booksNfsName" . }}
-    {{- include "audiobookshelf.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "audiobookshelf.booksNfsName" . }}
+    {{ include "audiobookshelf.labels" . | nindent 4 }}
 spec:
-  volumeName: {{- include "audiobookshelf.booksNfsName" . }}
+  volumeName: {{ include "audiobookshelf.booksNfsName" . }}
   storageClassName: nfs-client
   accessModes:
     - ReadWriteMany
@@ -19,13 +19,13 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{- include "audiobookshelf.audiobooksNfsName" . }}
+  name: {{ include "audiobookshelf.audiobooksNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{- include "audiobookshelf.audiobooksNfsName" . }}
+    app.kubernetes.io/name: {{ include "audiobookshelf.audiobooksNfsName" . }}
     {{- include "audiobookshelf.labels" . | nindent 4 }}
 spec:
-  volumeName: {{- include "audiobookshelf.audiobooksNfsName" . }}
+  volumeName: {{ include "audiobookshelf.audiobooksNfsName" . }}
   storageClassName: nfs-client
   accessModes:
     - ReadWriteMany
@@ -37,13 +37,13 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{- include "audiobookshelf.podcastsNfsName" . }}
+  name: {{ include "audiobookshelf.podcastsNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{- include "audiobookshelf.podcastsNfsName" . }}
+    app.kubernetes.io/name: {{ include "audiobookshelf.podcastsNfsName" . }}
     {{- include "audiobookshelf.labels" . | nindent 4 }}
 spec:
-  volumeName: {{- include "audiobookshelf.podcastsNfsName" . }}
+  volumeName: {{ include "audiobookshelf.podcastsNfsName" . }}
   storageClassName: nfs-client
   accessModes:
     - ReadWriteMany
diff --git a/clusters/cl01tl/helm/audiobookshelf/templates/persistent-volume.yaml b/clusters/cl01tl/helm/audiobookshelf/templates/persistent-volume.yaml
index e6a4e3467..f6f7338fe 100644
--- a/clusters/cl01tl/helm/audiobookshelf/templates/persistent-volume.yaml
+++ b/clusters/cl01tl/helm/audiobookshelf/templates/persistent-volume.yaml
@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: {{- include "audiobookshelf.booksNfsName" . }}
+  name: {{ include "audiobookshelf.booksNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{- include "audiobookshelf.booksNfsName" . }}
+    app.kubernetes.io/name: {{ include "audiobookshelf.booksNfsName" . }}
     {{- include "audiobookshelf.labels" . | nindent 4 }}
 spec:
   persistentVolumeReclaimPolicy: Retain
@@ -25,10 +25,10 @@ spec:
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: {{- include "audiobookshelf.audiobooksNfsName" . }}
+  name: {{ include "audiobookshelf.audiobooksNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{- include "audiobookshelf.audiobooksNfsName" . }}
+    app.kubernetes.io/name: {{ include "audiobookshelf.audiobooksNfsName" . }}
     {{- include "audiobookshelf.labels" . | nindent 4 }}
 spec:
   persistentVolumeReclaimPolicy: Retain
@@ -49,10 +49,10 @@ spec:
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: {{- include "audiobookshelf.podcastsNfsName" . }}
+  name: {{ include "audiobookshelf.podcastsNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{- include "audiobookshelf.podcastsNfsName" . }}
+    app.kubernetes.io/name: {{ include "audiobookshelf.podcastsNfsName" . }}
     {{- include "audiobookshelf.labels" . | nindent 4 }}
 spec:
   persistentVolumeReclaimPolicy: Retain

From a8a63a82d708be52cf3eda30d26bb01aac5a9b79 Mon Sep 17 00:00:00 2001
From: Alex Lebens <alexanderlebens@gmail.com>
Date: Mon, 20 Apr 2026 15:10:06 -0500
Subject: [PATCH 4/5] feat: use common 'custom' namespace for helper'

---
 .../cl01tl/helm/argocd/templates/_helpers.tpl |  6 ++---
 .../argocd/templates/external-secret.yaml     |  4 ++--
 .../audiobookshelf/templates/_helpers.tpl     | 12 +++++-----
 .../templates/external-secret.yaml            |  2 +-
 .../templates/persistent-volume-claim.yaml    | 24 +++++++++----------
 .../templates/persistent-volume.yaml          | 18 +++++++-------
 .../helm/authentik/templates/_helpers.tpl     |  6 ++---
 .../authentik/templates/external-secret.yaml  |  2 +-
 .../helm/authentik/templates/ingress.yaml     |  2 +-
 .../authentik/templates/reference-grant.yaml  |  2 +-
 .../helm/backrest/templates/_helpers.tpl      | 10 ++++----
 .../templates/persistent-volume-claim.yaml    | 16 ++++++-------
 .../backrest/templates/persistent-volume.yaml | 12 +++++-----
 .../cl01tl/helm/bazarr/templates/_helpers.tpl |  8 +++----
 .../bazarr/templates/external-secret.yaml     |  2 +-
 .../templates/persistent-volume-claim.yaml    |  8 +++----
 .../bazarr/templates/persistent-volume.yaml   |  6 ++---
 .../helm/cert-manager/templates/_helpers.tpl  | 10 ++++----
 .../templates/cluster-issuer.yaml             |  6 ++---
 .../templates/external-secret.yaml            |  8 +++----
 .../cl01tl/helm/cilium/templates/_helpers.tpl |  6 ++---
 .../cilium-load-balancer-ip-pool.yaml         |  4 ++--
 .../helm/cilium/templates/http-route.yaml     |  2 +-
 .../helm/dawarich/templates/_helpers.tpl      |  6 ++---
 .../dawarich/templates/external-secret.yaml   |  4 ++--
 25 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/clusters/cl01tl/helm/argocd/templates/_helpers.tpl b/clusters/cl01tl/helm/argocd/templates/_helpers.tpl
index 251852577..10688fcef 100644
--- a/clusters/cl01tl/helm/argocd/templates/_helpers.tpl
+++ b/clusters/cl01tl/helm/argocd/templates/_helpers.tpl
@@ -1,14 +1,14 @@
 {{/*
 Common labels
 */}}
-{{- define "argocd.labels" -}}
-{{ include "argocd.selectorLabels" $ }}
+{{- define "custom.labels" -}}
+{{ include "custom.selectorLabels" $ }}
 {{- end }}
 
 {{/*
 Selector labels
 */}}
-{{- define "argocd.selectorLabels" -}}
+{{- define "custom.selectorLabels" -}}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/part-of: {{ .Release.Name }}
 {{- end }}
diff --git a/clusters/cl01tl/helm/argocd/templates/external-secret.yaml b/clusters/cl01tl/helm/argocd/templates/external-secret.yaml
index 8626fb963..1bd10429d 100644
--- a/clusters/cl01tl/helm/argocd/templates/external-secret.yaml
+++ b/clusters/cl01tl/helm/argocd/templates/external-secret.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: argocd-oidc-authentik
-    {{- include "argocd.labels" . | nindent 4 }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
@@ -28,7 +28,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: argocd-notifications-ntfy
-    {{- include "argocd.labels" . | nindent 4 }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
diff --git a/clusters/cl01tl/helm/audiobookshelf/templates/_helpers.tpl b/clusters/cl01tl/helm/audiobookshelf/templates/_helpers.tpl
index fafc16ec0..92b2157f0 100644
--- a/clusters/cl01tl/helm/audiobookshelf/templates/_helpers.tpl
+++ b/clusters/cl01tl/helm/audiobookshelf/templates/_helpers.tpl
@@ -1,14 +1,14 @@
 {{/*
 Common labels
 */}}
-{{- define "audiobookshelf.labels" -}}
-{{ include "audiobookshelf.selectorLabels" $ }}
+{{- define "custom.labels" -}}
+{{ include "custom.selectorLabels" $ }}
 {{- end }}
 
 {{/*
 Selector labels
 */}}
-{{- define "audiobookshelf.selectorLabels" -}}
+{{- define "custom.selectorLabels" -}}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/part-of: {{ .Release.Name }}
 {{- end }}
@@ -16,12 +16,12 @@ app.kubernetes.io/part-of: {{ .Release.Name }}
 {{/*
 NFS names
 */}}
-{{- define "audiobookshelf.booksNfsName" -}}
+{{- define "custom.booksNfsName" -}}
 audiobookshelf-books-nfs-storage
 {{- end -}}
-{{- define "audiobookshelf.audiobooksNfsName" -}}
+{{- define "custom.audiobooksNfsName" -}}
 audiobookshelf-audiobooks-nfs-storage
 {{- end -}}
-{{- define "audiobookshelf.podcastsNfsName" -}}
+{{- define "custom.podcastsNfsName" -}}
 audiobookshelf-podcasts-nfs-storage
 {{- end -}}
diff --git a/clusters/cl01tl/helm/audiobookshelf/templates/external-secret.yaml b/clusters/cl01tl/helm/audiobookshelf/templates/external-secret.yaml
index d82c2ad62..bcc08b1e8 100644
--- a/clusters/cl01tl/helm/audiobookshelf/templates/external-secret.yaml
+++ b/clusters/cl01tl/helm/audiobookshelf/templates/external-secret.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: audiobookshelf-config-apprise
-    {{- include "audiobookshelf.labels" . | nindent 4 }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
diff --git a/clusters/cl01tl/helm/audiobookshelf/templates/persistent-volume-claim.yaml b/clusters/cl01tl/helm/audiobookshelf/templates/persistent-volume-claim.yaml
index 2edf51afe..111faa423 100644
--- a/clusters/cl01tl/helm/audiobookshelf/templates/persistent-volume-claim.yaml
+++ b/clusters/cl01tl/helm/audiobookshelf/templates/persistent-volume-claim.yaml
@@ -1,13 +1,13 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{ include "audiobookshelf.booksNfsName" . }}
+  name: {{ include "custom.booksNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ include "audiobookshelf.booksNfsName" . }}
-    {{ include "audiobookshelf.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "custom.booksNfsName" . }}
+    {{ include "custom.labels" . | nindent 4 }}
 spec:
-  volumeName: {{ include "audiobookshelf.booksNfsName" . }}
+  volumeName: {{ include "custom.booksNfsName" . }}
   storageClassName: nfs-client
   accessModes:
     - ReadWriteMany
@@ -19,13 +19,13 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{ include "audiobookshelf.audiobooksNfsName" . }}
+  name: {{ include "custom.audiobooksNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ include "audiobookshelf.audiobooksNfsName" . }}
-    {{- include "audiobookshelf.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "custom.audiobooksNfsName" . }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
-  volumeName: {{ include "audiobookshelf.audiobooksNfsName" . }}
+  volumeName: {{ include "custom.audiobooksNfsName" . }}
   storageClassName: nfs-client
   accessModes:
     - ReadWriteMany
@@ -37,13 +37,13 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{ include "audiobookshelf.podcastsNfsName" . }}
+  name: {{ include "custom.podcastsNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ include "audiobookshelf.podcastsNfsName" . }}
-    {{- include "audiobookshelf.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "custom.podcastsNfsName" . }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
-  volumeName: {{ include "audiobookshelf.podcastsNfsName" . }}
+  volumeName: {{ include "custom.podcastsNfsName" . }}
   storageClassName: nfs-client
   accessModes:
     - ReadWriteMany
diff --git a/clusters/cl01tl/helm/audiobookshelf/templates/persistent-volume.yaml b/clusters/cl01tl/helm/audiobookshelf/templates/persistent-volume.yaml
index f6f7338fe..b24d092c2 100644
--- a/clusters/cl01tl/helm/audiobookshelf/templates/persistent-volume.yaml
+++ b/clusters/cl01tl/helm/audiobookshelf/templates/persistent-volume.yaml
@@ -1,11 +1,11 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: {{ include "audiobookshelf.booksNfsName" . }}
+  name: {{ include "custom.booksNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ include "audiobookshelf.booksNfsName" . }}
-    {{- include "audiobookshelf.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "custom.booksNfsName" . }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   persistentVolumeReclaimPolicy: Retain
   storageClassName: nfs-client
@@ -25,11 +25,11 @@ spec:
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: {{ include "audiobookshelf.audiobooksNfsName" . }}
+  name: {{ include "custom.audiobooksNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ include "audiobookshelf.audiobooksNfsName" . }}
-    {{- include "audiobookshelf.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "custom.audiobooksNfsName" . }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   persistentVolumeReclaimPolicy: Retain
   storageClassName: nfs-client
@@ -49,11 +49,11 @@ spec:
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: {{ include "audiobookshelf.podcastsNfsName" . }}
+  name: {{ include "custom.podcastsNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ include "audiobookshelf.podcastsNfsName" . }}
-    {{- include "audiobookshelf.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "custom.podcastsNfsName" . }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   persistentVolumeReclaimPolicy: Retain
   storageClassName: nfs-client
diff --git a/clusters/cl01tl/helm/authentik/templates/_helpers.tpl b/clusters/cl01tl/helm/authentik/templates/_helpers.tpl
index 523f2ccb7..10688fcef 100644
--- a/clusters/cl01tl/helm/authentik/templates/_helpers.tpl
+++ b/clusters/cl01tl/helm/authentik/templates/_helpers.tpl
@@ -1,14 +1,14 @@
 {{/*
 Common labels
 */}}
-{{- define "authentik.labels" -}}
-{{ include "authentik.selectorLabels" $ }}
+{{- define "custom.labels" -}}
+{{ include "custom.selectorLabels" $ }}
 {{- end }}
 
 {{/*
 Selector labels
 */}}
-{{- define "authentik.selectorLabels" -}}
+{{- define "custom.selectorLabels" -}}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/part-of: {{ .Release.Name }}
 {{- end }}
diff --git a/clusters/cl01tl/helm/authentik/templates/external-secret.yaml b/clusters/cl01tl/helm/authentik/templates/external-secret.yaml
index 7d2fa7041..fd6e59848 100644
--- a/clusters/cl01tl/helm/authentik/templates/external-secret.yaml
+++ b/clusters/cl01tl/helm/authentik/templates/external-secret.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: authentik-key
-    {{- include "authentik.labels" . | nindent 4 }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
diff --git a/clusters/cl01tl/helm/authentik/templates/ingress.yaml b/clusters/cl01tl/helm/authentik/templates/ingress.yaml
index b16db26c5..d03d9b19e 100644
--- a/clusters/cl01tl/helm/authentik/templates/ingress.yaml
+++ b/clusters/cl01tl/helm/authentik/templates/ingress.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/name: {{ .Release.Name }}-tailscale
     tailscale.com/proxy-class: no-metrics
-    {{- include "authentik.labels" . | nindent 4 }}
+    {{- include "custom.labels" . | nindent 4 }}
   annotations:
     tailscale.com/experimental-forward-cluster-traffic-via-ingress: "true"
 spec:
diff --git a/clusters/cl01tl/helm/authentik/templates/reference-grant.yaml b/clusters/cl01tl/helm/authentik/templates/reference-grant.yaml
index b03d840fb..cd6a2e2b8 100644
--- a/clusters/cl01tl/helm/authentik/templates/reference-grant.yaml
+++ b/clusters/cl01tl/helm/authentik/templates/reference-grant.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: allow-outpost-cross-namespace-access
-    {{- include "authentik.labels" . | nindent 4 }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   from:
     - group: gateway.networking.k8s.io
diff --git a/clusters/cl01tl/helm/backrest/templates/_helpers.tpl b/clusters/cl01tl/helm/backrest/templates/_helpers.tpl
index 13cb540f8..5d6aba1a4 100644
--- a/clusters/cl01tl/helm/backrest/templates/_helpers.tpl
+++ b/clusters/cl01tl/helm/backrest/templates/_helpers.tpl
@@ -1,14 +1,14 @@
 {{/*
 Common labels
 */}}
-{{- define "backrest.labels" -}}
-{{ include "backrest.selectorLabels" $ }}
+{{- define "custom.labels" -}}
+{{ include "custom.selectorLabels" $ }}
 {{- end }}
 
 {{/*
 Selector labels
 */}}
-{{- define "backrest.selectorLabels" -}}
+{{- define "custom.selectorLabels" -}}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/part-of: {{ .Release.Name }}
 {{- end }}
@@ -16,9 +16,9 @@ app.kubernetes.io/part-of: {{ .Release.Name }}
 {{/*
 NFS names
 */}}
-{{- define "backrest.storageNfsName" -}}
+{{- define "custom.storageNfsName" -}}
 backrest-nfs-storage
 {{- end -}}
-{{- define "backrest.shareNfsName" -}}
+{{- define "custom.shareNfsName" -}}
 backrest-nfs-share
 {{- end -}}
diff --git a/clusters/cl01tl/helm/backrest/templates/persistent-volume-claim.yaml b/clusters/cl01tl/helm/backrest/templates/persistent-volume-claim.yaml
index 30ec73aa5..58ba6d02d 100644
--- a/clusters/cl01tl/helm/backrest/templates/persistent-volume-claim.yaml
+++ b/clusters/cl01tl/helm/backrest/templates/persistent-volume-claim.yaml
@@ -1,13 +1,13 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{- include "backrest.storageNfsName" . }}
+  name: {{ include "custom.storageNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{- include "backrest.storageNfsName" . }}
-    {{- include "backrest.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "custom.storageNfsName" . }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
-  volumeName: {{- include "backrest.storageNfsName" . }}
+  volumeName: {{ include "custom.storageNfsName" . }}
   storageClassName: nfs-client
   accessModes:
     - ReadWriteMany
@@ -19,13 +19,13 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{- include "backrest.shareNfsName" . }}
+  name: {{ include "custom.shareNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{- include "backrest.shareNfsName" . }}
-    {{- include "backrest.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "custom.shareNfsName" . }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
-  volumeName: {{- include "backrest.shareNfsName" . }}
+  volumeName: {{ include "custom.shareNfsName" . }}
   storageClassName: nfs-client
   accessModes:
     - ReadWriteMany
diff --git a/clusters/cl01tl/helm/backrest/templates/persistent-volume.yaml b/clusters/cl01tl/helm/backrest/templates/persistent-volume.yaml
index d1f889f7a..bd25c5e29 100644
--- a/clusters/cl01tl/helm/backrest/templates/persistent-volume.yaml
+++ b/clusters/cl01tl/helm/backrest/templates/persistent-volume.yaml
@@ -1,11 +1,11 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: {{- include "backrest.storageNfsName" . }}
+  name: {{ include "custom.storageNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{- include "backrest.storageNfsName" . }}
-    {{- include "backrest.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "custom.storageNfsName" . }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   persistentVolumeReclaimPolicy: Retain
   storageClassName: nfs-client
@@ -25,11 +25,11 @@ spec:
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: {{- include "backrest.shareNfsName" . }}
+  name: {{ include "custom.shareNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{- include "backrest.shareNfsName" . }}
-    {{- include "backrest.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "custom.shareNfsName" . }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   persistentVolumeReclaimPolicy: Retain
   storageClassName: nfs-client
diff --git a/clusters/cl01tl/helm/bazarr/templates/_helpers.tpl b/clusters/cl01tl/helm/bazarr/templates/_helpers.tpl
index b86c452c0..9d2e95087 100644
--- a/clusters/cl01tl/helm/bazarr/templates/_helpers.tpl
+++ b/clusters/cl01tl/helm/bazarr/templates/_helpers.tpl
@@ -1,14 +1,14 @@
 {{/*
 Common labels
 */}}
-{{- define "bazarr.labels" -}}
-{{ include "bazarr.selectorLabels" $ }}
+{{- define "custom.labels" -}}
+{{ include "custom.selectorLabels" $ }}
 {{- end }}
 
 {{/*
 Selector labels
 */}}
-{{- define "bazarr.selectorLabels" -}}
+{{- define "custom.selectorLabels" -}}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/part-of: {{ .Release.Name }}
 {{- end }}
@@ -16,6 +16,6 @@ app.kubernetes.io/part-of: {{ .Release.Name }}
 {{/*
 NFS names
 */}}
-{{- define "bazarr.storageNfsName" -}}
+{{- define "custom.storageNfsName" -}}
 bazarr-nfs-storage
 {{- end -}}
diff --git a/clusters/cl01tl/helm/bazarr/templates/external-secret.yaml b/clusters/cl01tl/helm/bazarr/templates/external-secret.yaml
index b2421d884..6bb426c16 100644
--- a/clusters/cl01tl/helm/bazarr/templates/external-secret.yaml
+++ b/clusters/cl01tl/helm/bazarr/templates/external-secret.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: bazarr-key
-    {{- include "bazarr.labels" . | nindent 4 }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
diff --git a/clusters/cl01tl/helm/bazarr/templates/persistent-volume-claim.yaml b/clusters/cl01tl/helm/bazarr/templates/persistent-volume-claim.yaml
index a71736ef3..7652a28b7 100644
--- a/clusters/cl01tl/helm/bazarr/templates/persistent-volume-claim.yaml
+++ b/clusters/cl01tl/helm/bazarr/templates/persistent-volume-claim.yaml
@@ -1,13 +1,13 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{- include "bazarr.storageNfsName" . }}
+  name: {{ include "custom.storageNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{- include "bazarr.storageNfsName" . }}
-    {{- include "bazarr.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "custom.storageNfsName" . }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
-  volumeName: {{ .Template.Name }}
+  volumeName: {{ include "custom.storageNfsName" . }}
   storageClassName: nfs-client
   accessModes:
     - ReadWriteMany
diff --git a/clusters/cl01tl/helm/bazarr/templates/persistent-volume.yaml b/clusters/cl01tl/helm/bazarr/templates/persistent-volume.yaml
index 2021b4a6d..7ce8d62aa 100644
--- a/clusters/cl01tl/helm/bazarr/templates/persistent-volume.yaml
+++ b/clusters/cl01tl/helm/bazarr/templates/persistent-volume.yaml
@@ -1,11 +1,11 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: {{- include "bazarr.storageNfsName" . }}
+  name: {{ include "custom.storageNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{- include "bazarr.storageNfsName" . }}
-    {{- include "bazarr.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "custom.storageNfsName" . }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   persistentVolumeReclaimPolicy: Retain
   storageClassName: nfs-client
diff --git a/clusters/cl01tl/helm/cert-manager/templates/_helpers.tpl b/clusters/cl01tl/helm/cert-manager/templates/_helpers.tpl
index fd08bb911..df7fe04fc 100644
--- a/clusters/cl01tl/helm/cert-manager/templates/_helpers.tpl
+++ b/clusters/cl01tl/helm/cert-manager/templates/_helpers.tpl
@@ -1,14 +1,14 @@
 {{/*
 Common labels
 */}}
-{{- define "cert-manager.labels" -}}
-{{ include "cert-manager.selectorLabels" $ }}
+{{- define "custom.labels" -}}
+{{ include "custom.selectorLabels" $ }}
 {{- end }}
 
 {{/*
 Selector labels
 */}}
-{{- define "cert-manager.selectorLabels" -}}
+{{- define "custom.selectorLabels" -}}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/part-of: {{ .Release.Name }}
 {{- end }}
@@ -16,9 +16,9 @@ app.kubernetes.io/part-of: {{ .Release.Name }}
 {{/*
 NFS names
 */}}
-{{- define "cert-manager.cloudflareSecretName" -}}
+{{- define "custom.cloudflareSecretName" -}}
 cert-manager-cloudflare-api-token
 {{- end -}}
-{{- define "cert-manager.cloudflareSecretKey" -}}
+{{- define "custom.cloudflareSecretKey" -}}
 api-token
 {{- end -}}
diff --git a/clusters/cl01tl/helm/cert-manager/templates/cluster-issuer.yaml b/clusters/cl01tl/helm/cert-manager/templates/cluster-issuer.yaml
index 73587a621..3c1d38b6c 100644
--- a/clusters/cl01tl/helm/cert-manager/templates/cluster-issuer.yaml
+++ b/clusters/cl01tl/helm/cert-manager/templates/cluster-issuer.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: letsencrypt-issuer
-    {{- include "cert-manager.labels" . | nindent 4 }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   acme:
     email: alexanderlebens@gmail.com
@@ -21,5 +21,5 @@ spec:
           cloudflare:
             email: alexanderlebens@gmail.com
             apiTokenSecretRef:
-              name: {{- include "cert-manager.cloudflareSecretName" . }}
-              key: {{- include "cert-manager.cloudflareSecretKey" . }}
+              name: {{ include "custom.cloudflareSecretName" . }}
+              key: {{ include "custom.cloudflareSecretKey" . }}
diff --git a/clusters/cl01tl/helm/cert-manager/templates/external-secret.yaml b/clusters/cl01tl/helm/cert-manager/templates/external-secret.yaml
index ab52d7d52..4a25a5d2a 100644
--- a/clusters/cl01tl/helm/cert-manager/templates/external-secret.yaml
+++ b/clusters/cl01tl/helm/cert-manager/templates/external-secret.yaml
@@ -1,17 +1,17 @@
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: {{- include "cert-manager.cloudflareSecretName" . }}
+  name: {{ include "custom.cloudflareSecretName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{- include "cert-manager.cloudflareSecretName" . }}
-    {{- include "cert-manager.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "custom.cloudflareSecretName" . }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
     name: openbao
   data:
-    - secretKey: {{- include "cert-manager.cloudflareSecretKey" . }}
+    - secretKey: {{ include "custom.cloudflareSecretKey" . }}
       remoteRef:
         key: /cloudflare/alexlebens.net/cl01tl-issuer-certificate
         property: token
diff --git a/clusters/cl01tl/helm/cilium/templates/_helpers.tpl b/clusters/cl01tl/helm/cilium/templates/_helpers.tpl
index 4a67642f9..10688fcef 100644
--- a/clusters/cl01tl/helm/cilium/templates/_helpers.tpl
+++ b/clusters/cl01tl/helm/cilium/templates/_helpers.tpl
@@ -1,14 +1,14 @@
 {{/*
 Common labels
 */}}
-{{- define "cilium.labels" -}}
-{{ include "cilium.selectorLabels" $ }}
+{{- define "custom.labels" -}}
+{{ include "custom.selectorLabels" $ }}
 {{- end }}
 
 {{/*
 Selector labels
 */}}
-{{- define "cilium.selectorLabels" -}}
+{{- define "custom.selectorLabels" -}}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/part-of: {{ .Release.Name }}
 {{- end }}
diff --git a/clusters/cl01tl/helm/cilium/templates/cilium-load-balancer-ip-pool.yaml b/clusters/cl01tl/helm/cilium/templates/cilium-load-balancer-ip-pool.yaml
index a3b8a2917..1576eb0b1 100644
--- a/clusters/cl01tl/helm/cilium/templates/cilium-load-balancer-ip-pool.yaml
+++ b/clusters/cl01tl/helm/cilium/templates/cilium-load-balancer-ip-pool.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: default-ip-pool
-    {{- include "cilium.labels" . | nindent 4 }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   blocks:
     - start: "10.232.1.21"
@@ -19,7 +19,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: bgp-ip-pool
-    {{- include "cilium.labels" . | nindent 4 }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   blocks:
     - start: "10.232.2.100"
diff --git a/clusters/cl01tl/helm/cilium/templates/http-route.yaml b/clusters/cl01tl/helm/cilium/templates/http-route.yaml
index f2e951592..f631ec670 100644
--- a/clusters/cl01tl/helm/cilium/templates/http-route.yaml
+++ b/clusters/cl01tl/helm/cilium/templates/http-route.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: hubble
-    {{- include "cilium.labels" . | nindent 4 }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   parentRefs:
     - group: gateway.networking.k8s.io
diff --git a/clusters/cl01tl/helm/dawarich/templates/_helpers.tpl b/clusters/cl01tl/helm/dawarich/templates/_helpers.tpl
index fd1b5cc89..10688fcef 100644
--- a/clusters/cl01tl/helm/dawarich/templates/_helpers.tpl
+++ b/clusters/cl01tl/helm/dawarich/templates/_helpers.tpl
@@ -1,14 +1,14 @@
 {{/*
 Common labels
 */}}
-{{- define "dawarich.labels" -}}
-{{ include "dawarich.selectorLabels" $ }}
+{{- define "custom.labels" -}}
+{{ include "custom.selectorLabels" $ }}
 {{- end }}
 
 {{/*
 Selector labels
 */}}
-{{- define "dawarich.selectorLabels" -}}
+{{- define "custom.selectorLabels" -}}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/part-of: {{ .Release.Name }}
 {{- end }}
diff --git a/clusters/cl01tl/helm/dawarich/templates/external-secret.yaml b/clusters/cl01tl/helm/dawarich/templates/external-secret.yaml
index 924a8baa5..821516e39 100644
--- a/clusters/cl01tl/helm/dawarich/templates/external-secret.yaml
+++ b/clusters/cl01tl/helm/dawarich/templates/external-secret.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: dawarich-key
-    {{- include "dawarich.labels" . | nindent 4 }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
@@ -24,7 +24,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: dawarich-oidc-authentik
-    {{- include "dawarich.labels" . | nindent 4 }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore

From a2aa2f465d7955245efa520ad71a5eccc247491b Mon Sep 17 00:00:00 2001
From: Alex Lebens <alexanderlebens@gmail.com>
Date: Mon, 20 Apr 2026 15:11:44 -0500
Subject: [PATCH 5/5] ci: reconfigure

---
 renovate.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/renovate.json b/renovate.json
index 51fbda527..65f222718 100644
--- a/renovate.json
+++ b/renovate.json
@@ -89,10 +89,10 @@
     {
       "description": "Specific app grouping overrides",
       "matchPackageNames": [
-        "/(^|/|-)(argo-cd|bazarr|cilium|dawarich|element-web|home-assistant|immich|komodo|plex|postiz|prowlarr|radarr|rook-ceph|roundcube|rybbit|sonarr|sparkyfitness|tdarr|traefik)/",
+        "/(^|/|-)(argo-cd|bazarr|cilium|dawarich|element-web|home-assistant|immich|komodo|plex|postiz|prowlarr|radarr|rook-ceph|roundcube|rybbit|sonarr|sparkyfitness|stalwartlabs|tdarr|traefik)/",
         "/^rook(-ceph|/rook|/ceph)/"
       ],
-      "groupName": "{{#if packageName}}{{{replace '^.*(argo-cd|bazarr|cilium|dawarich|element-web|home-assistant|immich|komodo|plex|postiz|prowlarr|radarr|rook-ceph|roundcube|rybbit|sonarr|sparkyfitness|tdarr|traefik).*$' '$1' packageName}}}{{else}}{{{replace '^.*(argo-cd|bazarr|cilium|dawarich|element-web|home-assistant|immich|komodo|plex|postiz|prowlarr|radarr|rook-ceph|roundcube|rybbit|sonarr|sparkyfitness|tdarr|traefik).*$' '$1' depName}}}{{/if}}",
+      "groupName": "{{#if packageName}}{{{replace '^.*(argo-cd|bazarr|cilium|dawarich|element-web|home-assistant|immich|komodo|plex|postiz|prowlarr|radarr|rook-ceph|roundcube|rybbit|sonarr|sparkyfitness|stalwartlabs|tdarr|traefik).*$' '$1' packageName}}}{{else}}{{{replace '^.*(argo-cd|bazarr|cilium|dawarich|element-web|home-assistant|immich|komodo|plex|postiz|prowlarr|radarr|rook-ceph|roundcube|rybbit|sonarr|sparkyfitness|stalwartlabs|tdarr|traefik).*$' '$1' depName}}}{{/if}}",
       "groupSlug": "unified-{{{groupName}}}"
     },
     {