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

---
 clusters/cl01tl/platform/vault/Chart.yaml     |  4 +--
 .../vault/templates/external-secret.yaml      | 35 ++++---------------
 .../platform/vault/templates/http-route.yaml  |  5 +--
 .../platform/vault/templates/ingress.yaml     |  5 +--
 .../templates/persistent-volume-claim.yaml    |  5 +--
 clusters/cl01tl/platform/vault/values.yaml    |  4 ---
 6 files changed, 12 insertions(+), 46 deletions(-)

diff --git a/clusters/cl01tl/platform/vault/Chart.yaml b/clusters/cl01tl/platform/vault/Chart.yaml
index 05e0cd762..2863cc98f 100644
--- a/clusters/cl01tl/platform/vault/Chart.yaml
+++ b/clusters/cl01tl/platform/vault/Chart.yaml
@@ -24,10 +24,10 @@ dependencies:
   - name: app-template
     alias: snapshot
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 3.7.3
+    version: 4.0.1
   - name: app-template
     alias: unseal
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 3.7.3
+    version: 4.0.1
 icon: https://raw.githubusercontent.com/walkxcode/dashboard-icons/main/png/vault.png
 appVersion: 1.19.3
diff --git a/clusters/cl01tl/platform/vault/templates/external-secret.yaml b/clusters/cl01tl/platform/vault/templates/external-secret.yaml
index c967e6408..1a45339dd 100644
--- a/clusters/cl01tl/platform/vault/templates/external-secret.yaml
+++ b/clusters/cl01tl/platform/vault/templates/external-secret.yaml
@@ -4,11 +4,8 @@ metadata:
   name: vault-snapshot-agent-token
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: vault-snapshot-agent-token
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: snapshot
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
@@ -36,11 +33,8 @@ metadata:
   name: vault-snapshot-s3
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: vault-snapshot-s3
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: snapshot
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
@@ -75,11 +69,8 @@ metadata:
   name: vault-s3cmd-config
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: vault-snapshot-s3
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: snapshot
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
@@ -100,11 +91,8 @@ metadata:
   name: vault-unseal-config-1
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: vault-unseal-key-1
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: unseal
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
@@ -181,11 +169,8 @@ metadata:
   name: vault-unseal-config-2
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: vault-unseal-key-2
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: unseal
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
@@ -262,11 +247,8 @@ metadata:
   name: vault-unseal-config-3
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: vault-unseal-config-3
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: unseal
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
@@ -343,11 +325,8 @@ metadata:
   name: vault-token
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: vault-token
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: token
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
diff --git a/clusters/cl01tl/platform/vault/templates/http-route.yaml b/clusters/cl01tl/platform/vault/templates/http-route.yaml
index d9eeeec42..4dda091bf 100644
--- a/clusters/cl01tl/platform/vault/templates/http-route.yaml
+++ b/clusters/cl01tl/platform/vault/templates/http-route.yaml
@@ -4,11 +4,8 @@ metadata:
   name: http-route-vault
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: http-route-vault
+    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/vault/templates/ingress.yaml b/clusters/cl01tl/platform/vault/templates/ingress.yaml
index 14f0c8c3b..e53c2940d 100644
--- a/clusters/cl01tl/platform/vault/templates/ingress.yaml
+++ b/clusters/cl01tl/platform/vault/templates/ingress.yaml
@@ -4,11 +4,8 @@ metadata:
   name: vault-tailscale
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: vault-tailscale
+    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 }}
   labels:
     tailscale.com/proxy-class: no-metrics
   annotations:
diff --git a/clusters/cl01tl/platform/vault/templates/persistent-volume-claim.yaml b/clusters/cl01tl/platform/vault/templates/persistent-volume-claim.yaml
index 1d6024213..38e6ae61a 100644
--- a/clusters/cl01tl/platform/vault/templates/persistent-volume-claim.yaml
+++ b/clusters/cl01tl/platform/vault/templates/persistent-volume-claim.yaml
@@ -4,11 +4,8 @@ metadata:
   name: vault-nfs-storage-backup
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: vault-nfs-storage-backup
+    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:
   volumeMode: Filesystem
   storageClassName: nfs-client
diff --git a/clusters/cl01tl/platform/vault/values.yaml b/clusters/cl01tl/platform/vault/values.yaml
index 734601aee..b007ffd86 100644
--- a/clusters/cl01tl/platform/vault/values.yaml
+++ b/clusters/cl01tl/platform/vault/values.yaml
@@ -242,8 +242,6 @@ snapshot:
             requests:
               cpu: 100m
               memory: 128Mi
-  serviceAccount:
-    create: true
   persistence:
     config:
       existingClaim: vault-nfs-storage-backup
@@ -329,5 +327,3 @@ unseal:
             requests:
               cpu: 10m
               memory: 24Mi
-  serviceAccount:
-    create: true