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

---
 clusters/cl01tl/applications/kiwix/Chart.yaml                | 2 +-
 clusters/cl01tl/applications/kiwix/templates/http-route.yaml | 5 +----
 .../kiwix/templates/persistent-volume-claim.yaml             | 5 +----
 .../applications/kiwix/templates/persistent-volume.yaml      | 5 +----
 clusters/cl01tl/applications/kiwix/values.yaml               | 2 --
 5 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/clusters/cl01tl/applications/kiwix/Chart.yaml b/clusters/cl01tl/applications/kiwix/Chart.yaml
index 346cd5d39..78fbfa0d8 100644
--- a/clusters/cl01tl/applications/kiwix/Chart.yaml
+++ b/clusters/cl01tl/applications/kiwix/Chart.yaml
@@ -16,6 +16,6 @@ dependencies:
   - name: app-template
     alias: kiwix
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 3.7.3
+    version: 4.0.1
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/kiwix-dark.png
 appVersion: 3.7.0
diff --git a/clusters/cl01tl/applications/kiwix/templates/http-route.yaml b/clusters/cl01tl/applications/kiwix/templates/http-route.yaml
index 4a8c7054b..1bf5a1b95 100644
--- a/clusters/cl01tl/applications/kiwix/templates/http-route.yaml
+++ b/clusters/cl01tl/applications/kiwix/templates/http-route.yaml
@@ -4,11 +4,8 @@ metadata:
   name: http-route-kiwix
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: http-route-kiwix
+    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/applications/kiwix/templates/persistent-volume-claim.yaml b/clusters/cl01tl/applications/kiwix/templates/persistent-volume-claim.yaml
index 1fc6ceb18..721267b65 100644
--- a/clusters/cl01tl/applications/kiwix/templates/persistent-volume-claim.yaml
+++ b/clusters/cl01tl/applications/kiwix/templates/persistent-volume-claim.yaml
@@ -4,11 +4,8 @@ metadata:
   name: kiwix-nfs-storage
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: kiwix-nfs-storage
+    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: kiwix-nfs-storage
   storageClassName: nfs-client
diff --git a/clusters/cl01tl/applications/kiwix/templates/persistent-volume.yaml b/clusters/cl01tl/applications/kiwix/templates/persistent-volume.yaml
index a447c8e27..d8d706f3f 100644
--- a/clusters/cl01tl/applications/kiwix/templates/persistent-volume.yaml
+++ b/clusters/cl01tl/applications/kiwix/templates/persistent-volume.yaml
@@ -4,11 +4,8 @@ metadata:
   name: kiwix-nfs-storage
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: kiwix-nfs-storage
+    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:
   persistentVolumeReclaimPolicy: Retain
   storageClassName: nfs-client
diff --git a/clusters/cl01tl/applications/kiwix/values.yaml b/clusters/cl01tl/applications/kiwix/values.yaml
index 2ce81d1a1..f2d111fa0 100644
--- a/clusters/cl01tl/applications/kiwix/values.yaml
+++ b/clusters/cl01tl/applications/kiwix/values.yaml
@@ -20,8 +20,6 @@ kiwix:
             requests:
               cpu: 50m
               memory: 512Mi
-  serviceAccount:
-    create: true
   service:
     main:
       controller: main