From f6e9bb54b078825c60f9aad2e7d1ba95dc5cdd9b Mon Sep 17 00:00:00 2001
From: Alex Lebens <alexanderlebens@gmail.com>
Date: Fri, 16 May 2025 21:48:33 -0500
Subject: [PATCH] update app-template chart

---
 clusters/cl01tl/platform/stalwart/Chart.yaml                 | 2 +-
 .../cl01tl/platform/stalwart/templates/external-secret.yaml  | 3 ---
 clusters/cl01tl/platform/stalwart/templates/http-route.yaml  | 5 +----
 .../platform/stalwart/templates/replication-source.yaml      | 5 +----
 clusters/cl01tl/platform/stalwart/values.yaml                | 3 +--
 5 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/clusters/cl01tl/platform/stalwart/Chart.yaml b/clusters/cl01tl/platform/stalwart/Chart.yaml
index 662715b96..be9ff4def 100644
--- 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: 3.7.3
+    version: 4.0.1
     repository: https://bjw-s-labs.github.io/helm-charts/
   - name: valkey
     version: 3.0.6
diff --git a/clusters/cl01tl/platform/stalwart/templates/external-secret.yaml b/clusters/cl01tl/platform/stalwart/templates/external-secret.yaml
index c73a5101c..fa4b6865a 100644
--- a/clusters/cl01tl/platform/stalwart/templates/external-secret.yaml
+++ b/clusters/cl01tl/platform/stalwart/templates/external-secret.yaml
@@ -6,9 +6,6 @@ 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
diff --git a/clusters/cl01tl/platform/stalwart/templates/http-route.yaml b/clusters/cl01tl/platform/stalwart/templates/http-route.yaml
index a2cdb6fed..c2fc2170b 100644
--- a/clusters/cl01tl/platform/stalwart/templates/http-route.yaml
+++ b/clusters/cl01tl/platform/stalwart/templates/http-route.yaml
@@ -4,11 +4,8 @@ metadata:
   name: http-route-stalwart
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: http-route-stalwart
+    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:
   parentRefs:
     - group: gateway.networking.k8s.io
diff --git a/clusters/cl01tl/platform/stalwart/templates/replication-source.yaml b/clusters/cl01tl/platform/stalwart/templates/replication-source.yaml
index abe32de37..6dd374f22 100644
--- a/clusters/cl01tl/platform/stalwart/templates/replication-source.yaml
+++ b/clusters/cl01tl/platform/stalwart/templates/replication-source.yaml
@@ -4,11 +4,8 @@ metadata:
   name: stalwart-config-backup-source
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: stalwart-config-backup-source
+    app.kubernetes.io/name: {{ .Release.Name }}
     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:
diff --git a/clusters/cl01tl/platform/stalwart/values.yaml b/clusters/cl01tl/platform/stalwart/values.yaml
index dea1eed00..1b0659de3 100644
--- a/clusters/cl01tl/platform/stalwart/values.yaml
+++ b/clusters/cl01tl/platform/stalwart/values.yaml
@@ -15,8 +15,6 @@ stalwart:
             requests:
               cpu: 10m
               memory: 128Mi
-  serviceAccount:
-    create: true
   service:
     main:
       controller: main
@@ -43,6 +41,7 @@ stalwart:
           protocol: TCP
   persistence:
     config:
+      forceRename: stalwart-config
       storageClass: ceph-block
       accessMode: ReadWriteOnce
       size: 10Gi