Update Helm release gitea to v12

2025-05-17 02:41:08 +00:00
24 changed files with 180 additions and 58 deletions
--- a/clusters/cl01tl/platform/matrix-synapse/Chart.yaml
+++ b/clusters/cl01tl/platform/matrix-synapse/Chart.yaml
@@ -35,16 +35,16 @@ dependencies:
    repository: https://ananace.gitlab.io/charts
  - name: app-template
    alias: matrix-hookshot
-    version: 4.0.1
+    version: 3.7.3
    repository: https://bjw-s-labs.github.io/helm-charts/
  # - name: app-template
  #   alias: mautrix-discord
  #   repository: https://bjw-s-labs.github.io/helm-charts/
-  #   version: 4.0.1
+  #   version: 3.6.1
  # - name: app-template
  #   alias: mautrix-whatsapp
  #   repository: https://bjw-s-labs.github.io/helm-charts/
-  #   version: 4.0.1
+  #   version: 3.6.1
  - name: valkey
    alias: valkey-synapse
    version: 3.0.6
@@ -55,11 +55,11 @@ dependencies:
    repository: oci://harbor.alexlebens.net/proxy-registry-1.docker.io/bitnamicharts
  - name: cloudflared
    alias: cloudflared-synapse
-    version: 1.15.0
+    version: 1.14.8
    repository: oci://harbor.alexlebens.net/helm-charts
  - name: cloudflared
    alias: cloudflared-hookshot
-    version: 1.15.0
+    version: 1.14.8
    repository: oci://harbor.alexlebens.net/helm-charts
  - name: postgres-cluster
    alias: postgres-17-cluster
--- a/clusters/cl01tl/platform/matrix-synapse/templates/external-secret.yaml
+++ b/clusters/cl01tl/platform/matrix-synapse/templates/external-secret.yaml
@@ -4,8 +4,11 @@ metadata:
  name: matrix-synapse-config-secret
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: matrix-synapse-config-secret
    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: web
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
  secretStoreRef:
    kind: ClusterSecretStore
@@ -33,8 +36,11 @@ metadata:
  name: matrix-synapse-signingkey
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: matrix-synapse
    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: 1.125.0
+    app.kubernetes.io/component: signingkey-job
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
  secretStoreRef:
    kind: ClusterSecretStore
@@ -55,8 +61,11 @@ metadata:
  name: matrix-hookshot-config-secret
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: matrix-hookshot-config-secret
    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: web
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
  secretStoreRef:
    kind: ClusterSecretStore
@@ -97,9 +106,12 @@ spec:
 # metadata:
 #   name: mautrix-discord-config-secret
 #   namespace: {{ .Release.Namespace }}
-  # labels:
-  #   app.kubernetes.io/name: {{ .Release.Name }}
-  #   app.kubernetes.io/instance: {{ .Release.Name }}
+#   labels:
+#     app.kubernetes.io/name: mautrix-discord-config-secret
+#     app.kubernetes.io/instance: {{ .Release.Name }}
+#     app.kubernetes.io/version: {{ .Chart.AppVersion }}
+#     app.kubernetes.io/component: web
+#     app.kubernetes.io/part-of: {{ .Release.Name }}
 # spec:
 #   secretStoreRef:
 #     kind: ClusterSecretStore
@@ -126,9 +138,12 @@ spec:
 # metadata:
 #   name: mautrix-whatsapp-config-secret
 #   namespace: {{ .Release.Namespace }}
-  # labels:
-  #   app.kubernetes.io/name: {{ .Release.Name }}
-  #   app.kubernetes.io/instance: {{ .Release.Name }}
+#   labels:
+#     app.kubernetes.io/name: mautrix-whatsapp-config-secret
+#     app.kubernetes.io/instance: {{ .Release.Name }}
+#     app.kubernetes.io/version: {{ .Chart.AppVersion }}
+#     app.kubernetes.io/component: web
+#     app.kubernetes.io/part-of: {{ .Release.Name }}
 # spec:
 #   secretStoreRef:
 #     kind: ClusterSecretStore
@@ -156,8 +171,11 @@ metadata:
  name: double-puppet-registration-secret
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: double-puppet-registration-secret
    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: web
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
  secretStoreRef:
    kind: ClusterSecretStore
@@ -178,8 +196,11 @@ metadata:
  name: matrix-synapse-valkey-secret
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: matrix-synapse-valkey-secret
    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: web
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
  secretStoreRef:
    kind: ClusterSecretStore
@@ -200,8 +221,11 @@ metadata:
  name: matrix-synapse-cloudflared-synapse-secret
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: matrix-synapse-cloudflared-synapse-secret
    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: web
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
  secretStoreRef:
    kind: ClusterSecretStore
@@ -222,8 +246,11 @@ metadata:
  name: matrix-synapse-cloudflared-hookshot-secret
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: matrix-synapse-cloudflared-hookshot-secret
    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: web
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
  secretStoreRef:
    kind: ClusterSecretStore
@@ -244,8 +271,11 @@ metadata:
  name: matrix-synapse-backup-secret
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: matrix-synapse-backup-secret
    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: backup
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
  secretStoreRef:
    kind: ClusterSecretStore
@@ -299,9 +329,12 @@ spec:
 # metadata:
 #   name: mautrix-discord-data-backup-secret
 #   namespace: {{ .Release.Namespace }}
-  # labels:
-  #   app.kubernetes.io/name: {{ .Release.Name }}
-  #   app.kubernetes.io/instance: {{ .Release.Name }}
+#   labels:
+#     app.kubernetes.io/name: mautrix-discord-data-backup-secret
+#     app.kubernetes.io/instance: {{ .Release.Name }}
+#     app.kubernetes.io/version: {{ .Chart.AppVersion }}
+#     app.kubernetes.io/component: backup
+#     app.kubernetes.io/part-of: {{ .Release.Name }}
 # spec:
 #   secretStoreRef:
 #     kind: ClusterSecretStore
@@ -355,9 +388,12 @@ spec:
 # metadata:
 #   name: mautrix-whatsapp-data-backup-secret
 #   namespace: {{ .Release.Namespace }}
-  # labels:
-  #   app.kubernetes.io/name: {{ .Release.Name }}
-  #   app.kubernetes.io/instance: {{ .Release.Name }}
+#   labels:
+#     app.kubernetes.io/name: mautrix-whatsapp-data-backup-secret
+#     app.kubernetes.io/instance: {{ .Release.Name }}
+#     app.kubernetes.io/version: {{ .Chart.AppVersion }}
+#     app.kubernetes.io/component: backup
+#     app.kubernetes.io/part-of: {{ .Release.Name }}
 # spec:
 #   secretStoreRef:
 #     kind: ClusterSecretStore
@@ -412,8 +448,11 @@ metadata:
  name: matrix-synapse-postgresql-17-cluster-backup-secret
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: matrix-synapse-postgresql-17-cluster-backup-secret
    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: database
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
  secretStoreRef:
    kind: ClusterSecretStore
--- a/clusters/cl01tl/platform/matrix-synapse/templates/replication-source.yaml
+++ b/clusters/cl01tl/platform/matrix-synapse/templates/replication-source.yaml
@@ -4,8 +4,11 @@ metadata:
  name: matrix-synapse-backup-source
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: matrix-synapse-backup-source
    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: backup
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
  sourcePVC: matrix-synapse
  trigger:
@@ -29,9 +32,12 @@ spec:
 # metadata:
 #   name: mautrix-discord-data-backup-source
 #   namespace: {{ .Release.Namespace }}
-  # labels:
-  #   app.kubernetes.io/name: {{ .Release.Name }}
-  #   app.kubernetes.io/instance: {{ .Release.Name }}
+#   labels:
+#     app.kubernetes.io/name: mautrix-discord-data-backup-source
+#     app.kubernetes.io/instance: {{ .Release.Name }}
+#     app.kubernetes.io/version: {{ .Chart.AppVersion }}
+#     app.kubernetes.io/component: backup
+#     app.kubernetes.io/part-of: {{ .Release.Name }}
 # spec:
 #   sourcePVC: mautrix-discord-data
 #   trigger:
@@ -58,9 +64,12 @@ spec:
 # metadata:
 #   name: mautrix-whatsapp-data-backup-source
 #   namespace: {{ .Release.Namespace }}
-  # labels:
-  #   app.kubernetes.io/name: {{ .Release.Name }}
-  #   app.kubernetes.io/instance: {{ .Release.Name }}
+#   labels:
+#     app.kubernetes.io/name: mautrix-whatsapp-data-backup-source
+#     app.kubernetes.io/instance: {{ .Release.Name }}
+#     app.kubernetes.io/version: {{ .Chart.AppVersion }}
+#     app.kubernetes.io/component: backup
+#     app.kubernetes.io/part-of: {{ .Release.Name }}
 # spec:
 #   sourcePVC: mautrix-whatsapp-data
 #   trigger:
--- a/clusters/cl01tl/platform/matrix-synapse/templates/service-monitor.yaml
+++ b/clusters/cl01tl/platform/matrix-synapse/templates/service-monitor.yaml
@@ -4,8 +4,11 @@ metadata:
  name: matrix-synapse
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: matrix-synapse
    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: metrics
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
  selector:
    matchLabels:
@@ -24,8 +27,11 @@ metadata:
  name: matrix-hookshot
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: matrix-hookshot
    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: metrics
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
  selector:
    matchLabels:
--- a/clusters/cl01tl/platform/matrix-synapse/values.yaml
+++ b/clusters/cl01tl/platform/matrix-synapse/values.yaml
@@ -134,6 +134,8 @@ matrix-hookshot:
            requests:
              cpu: 10m
              memory: 128Mi
+  serviceAccount:
+    create: true
  service:
    main:
      controller: main
@@ -207,6 +209,8 @@ mautrix-discord:
            requests:
              cpu: 10m
              memory: 128Mi
+  serviceAccount:
+    create: true
  service:
    main:
      controller: main
@@ -256,6 +260,8 @@ mautrix-whatsapp:
            requests:
              cpu: 10m
              memory: 64Mi
+  serviceAccount:
+    create: true
  service:
    main:
      controller: main
--- a/clusters/cl01tl/platform/ollama/Chart.yaml
+++ b/clusters/cl01tl/platform/ollama/Chart.yaml
@@ -20,10 +20,10 @@ dependencies:
  - name: app-template
    alias: ollama
    repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.0.1
+    version: 3.7.3
  - name: postgres-cluster
    alias: postgres-17-cluster
    version: 5.1.0
    repository: oci://harbor.alexlebens.net/helm-charts
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/ollama.png
-appVersion: 0.7.0
+appVersion: 0.6.8
--- a/clusters/cl01tl/platform/ollama/templates/external-secret.yaml
+++ b/clusters/cl01tl/platform/ollama/templates/external-secret.yaml
@@ -5,8 +5,11 @@ metadata:
  name: ollama-key-secret
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: ollama-key-secret
    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: web
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
  secretStoreRef:
    kind: ClusterSecretStore
@@ -27,8 +30,11 @@ metadata:
  name: ollama-oidc-secret
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: ollama-oidc-secret
    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: auth
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
  secretStoreRef:
    kind: ClusterSecretStore
@@ -56,8 +62,11 @@ metadata:
  name: ollama-web-data-backup-secret
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: ollama-web-data-backup-secret
    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: backup
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
  secretStoreRef:
    kind: ClusterSecretStore
@@ -112,8 +121,11 @@ metadata:
  name: ollama-web-postgresql-17-cluster-backup-secret
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: ollama-web-postgresql-17-cluster-backup-secret
    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: database
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
  secretStoreRef:
    kind: ClusterSecretStore
--- a/clusters/cl01tl/platform/ollama/templates/http-route.yaml
+++ b/clusters/cl01tl/platform/ollama/templates/http-route.yaml
@@ -4,8 +4,11 @@ metadata:
  name: http-route-ollama
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: http-route-ollama
    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: web
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
  parentRefs:
    - group: gateway.networking.k8s.io
--- a/clusters/cl01tl/platform/ollama/templates/replication-source.yaml
+++ b/clusters/cl01tl/platform/ollama/templates/replication-source.yaml
@@ -4,8 +4,11 @@ metadata:
  name: ollama-web-data-backup-source
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: ollama-web-data-backup-source
    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: backup
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
  sourcePVC: ollama-web-data
  trigger:
--- a/clusters/cl01tl/platform/ollama/templates/service.yaml
+++ b/clusters/cl01tl/platform/ollama/templates/service.yaml
@@ -4,8 +4,11 @@ metadata:
  name: ollama-pd05wd
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: ollama-pd05wd
    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: network
+    app.kubernetes.io/part-of: {{ .Release.Name }}
  annotations:
    tailscale.com/tailnet-fqdn: ollama-pd05wd.boreal-beaufort.ts.net
 spec:
@@ -19,8 +22,11 @@ metadata:
  name: stable-diffusion-pd05wd
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: stable-diffusion-pd05wd
    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: network
+    app.kubernetes.io/part-of: {{ .Release.Name }}
  annotations:
    tailscale.com/tailnet-fqdn: stable-diffusion-pd05wd.boreal-beaufort.ts.net
 spec:
--- a/clusters/cl01tl/platform/ollama/values.yaml
+++ b/clusters/cl01tl/platform/ollama/values.yaml
@@ -166,6 +166,8 @@ ollama:
            requests:
              cpu: 10m
              memory: 1Gi
+  serviceAccount:
+    create: true
  service:
    server-1:
      controller: server-1
--- a/clusters/cl01tl/platform/qbittorrent/Chart.yaml
+++ b/clusters/cl01tl/platform/qbittorrent/Chart.yaml
@@ -23,6 +23,6 @@ dependencies:
  - name: app-template
    alias: qbittorrent
    repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.0.1
+    version: 3.7.3
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/qbittorrent.png
 appVersion: 5.1.0
--- a/clusters/cl01tl/platform/qbittorrent/templates/config-map.yaml
+++ b/clusters/cl01tl/platform/qbittorrent/templates/config-map.yaml
@@ -4,8 +4,11 @@ metadata:
  name: glutun-update-script
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: glutun-update-script
    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: gluetun
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 data:
  update.sh: |
    if ! command -v curl 2>&1 >/dev/null
--- a/clusters/cl01tl/platform/qbittorrent/templates/external-secret.yaml
+++ b/clusters/cl01tl/platform/qbittorrent/templates/external-secret.yaml
@@ -4,8 +4,11 @@ metadata:
  name: qbittorrent-wireguard-conf
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: qbittorrent-wireguard-conf
    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: web
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
  secretStoreRef:
    kind: ClusterSecretStore
--- a/clusters/cl01tl/platform/qbittorrent/templates/http-route.yaml
+++ b/clusters/cl01tl/platform/qbittorrent/templates/http-route.yaml
@@ -4,8 +4,11 @@ metadata:
  name: http-route-qbittorrent
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: http-route-qbittorrent
    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: web
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
  parentRefs:
    - group: gateway.networking.k8s.io
--- a/clusters/cl01tl/platform/qbittorrent/templates/persistent-volume-claim.yaml
+++ b/clusters/cl01tl/platform/qbittorrent/templates/persistent-volume-claim.yaml
@@ -4,8 +4,11 @@ metadata:
  name: qbittorrent-config
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: qbittorrent-config
    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: storage
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
  volumeName: qbittorrent-config
  storageClassName: nfs-client
@@ -24,6 +27,9 @@ metadata:
  labels:
    app.kubernetes.io/name: {{ .Release.Name }}
    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: storage
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
  volumeName: qbittorrent-nfs-storage
  storageClassName: nfs-client
--- a/clusters/cl01tl/platform/qbittorrent/templates/persistent-volume.yaml
+++ b/clusters/cl01tl/platform/qbittorrent/templates/persistent-volume.yaml
@@ -4,8 +4,11 @@ metadata:
  name: qbittorrent-config
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: qbittorrent-config
    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: storage
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
  persistentVolumeReclaimPolicy: Retain
  storageClassName: nfs-client
@@ -28,8 +31,11 @@ metadata:
  name: qbittorrent-nfs-storage
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: qbittorrent-nfs-storage
    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: storage
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
  persistentVolumeReclaimPolicy: Retain
  storageClassName: nfs-client
--- a/clusters/cl01tl/platform/qbittorrent/templates/service-monitor.yaml
+++ b/clusters/cl01tl/platform/qbittorrent/templates/service-monitor.yaml
@@ -4,8 +4,11 @@ metadata:
  name: qbittorrent
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: qbittorrent
    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: web
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
  endpoints:
    - port: metrics
--- a/clusters/cl01tl/platform/qbittorrent/values.yaml
+++ b/clusters/cl01tl/platform/qbittorrent/values.yaml
@@ -15,7 +15,7 @@ qbittorrent:
            privileged: True
          resources:
            requests:
-              cpu: 10m
+              cpu: 100m
              memory: 128Mi
          command:
            - /bin/sh
@@ -103,6 +103,8 @@ qbittorrent:
            requests:
              cpu: 10m
              memory: 64Mi
+  serviceAccount:
+    create: true
  service:
    main:
      controller: main
--- a/clusters/cl01tl/platform/stalwart/Chart.yaml
+++ b/clusters/cl01tl/platform/stalwart/Chart.yaml
@@ -22,7 +22,7 @@ maintainers:
 dependencies:
  - name: app-template
    alias: stalwart
-    version: 4.0.1
+    version: 3.7.3
    repository: https://bjw-s-labs.github.io/helm-charts/
  - name: valkey
    version: 3.0.6
--- a/clusters/cl01tl/platform/stalwart/templates/external-secret.yaml
+++ b/clusters/cl01tl/platform/stalwart/templates/external-secret.yaml
@@ -6,6 +6,9 @@ metadata:
  labels:
    app.kubernetes.io/name: {{ .Release.Name }}
    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: web
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
  secretStoreRef:
    kind: ClusterSecretStore
--- a/clusters/cl01tl/platform/stalwart/templates/http-route.yaml
+++ b/clusters/cl01tl/platform/stalwart/templates/http-route.yaml
@@ -4,8 +4,11 @@ metadata:
  name: http-route-stalwart
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: http-route-stalwart
    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: web
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
  parentRefs:
    - group: gateway.networking.k8s.io
--- a/clusters/cl01tl/platform/stalwart/templates/replication-source.yaml
+++ b/clusters/cl01tl/platform/stalwart/templates/replication-source.yaml
@@ -4,8 +4,11 @@ metadata:
  name: stalwart-config-backup-source
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: stalwart-config-backup-source
    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: backup
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
  sourcePVC: stalwart-config
  trigger:
--- a/clusters/cl01tl/platform/stalwart/values.yaml
+++ b/clusters/cl01tl/platform/stalwart/values.yaml
@@ -15,6 +15,8 @@ stalwart:
            requests:
              cpu: 10m
              memory: 128Mi
+  serviceAccount:
+    create: true
  service:
    main:
      controller: main
@@ -41,7 +43,6 @@ stalwart:
          protocol: TCP
  persistence:
    config:
-      forceRename: stalwart-config
      storageClass: ceph-block
      accessMode: ReadWriteOnce
      size: 10Gi