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

---
 clusters/cl01tl/platform/ollama/Chart.yaml    |  4 ++--
 .../ollama/templates/external-secret.yaml     | 20 ++++---------------
 .../platform/ollama/templates/http-route.yaml |  5 +----
 .../ollama/templates/replication-source.yaml  |  5 +----
 .../platform/ollama/templates/service.yaml    | 10 ++--------
 clusters/cl01tl/platform/ollama/values.yaml   |  2 --
 6 files changed, 10 insertions(+), 36 deletions(-)

diff --git a/clusters/cl01tl/platform/ollama/Chart.yaml b/clusters/cl01tl/platform/ollama/Chart.yaml
index 921e87679..569a369a5 100644
--- 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: 3.7.3
+    version: 4.0.1
   - 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.6.8
+appVersion: 0.7.0
diff --git a/clusters/cl01tl/platform/ollama/templates/external-secret.yaml b/clusters/cl01tl/platform/ollama/templates/external-secret.yaml
index 90a4a5a30..8934a6625 100644
--- a/clusters/cl01tl/platform/ollama/templates/external-secret.yaml
+++ b/clusters/cl01tl/platform/ollama/templates/external-secret.yaml
@@ -5,11 +5,8 @@ metadata:
   name: ollama-key-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: ollama-key-secret
+    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
@@ -30,11 +27,8 @@ metadata:
   name: ollama-oidc-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: ollama-oidc-secret
+    app.kubernetes.io/name: {{ .Release.Name }}
     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
@@ -62,11 +56,8 @@ metadata:
   name: ollama-web-data-backup-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: ollama-web-data-backup-secret
+    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:
   secretStoreRef:
     kind: ClusterSecretStore
@@ -121,11 +112,8 @@ metadata:
   name: ollama-web-postgresql-17-cluster-backup-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: ollama-web-postgresql-17-cluster-backup-secret
+    app.kubernetes.io/name: {{ .Release.Name }}
     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
diff --git a/clusters/cl01tl/platform/ollama/templates/http-route.yaml b/clusters/cl01tl/platform/ollama/templates/http-route.yaml
index 3a37e553f..e2c2c4300 100644
--- a/clusters/cl01tl/platform/ollama/templates/http-route.yaml
+++ b/clusters/cl01tl/platform/ollama/templates/http-route.yaml
@@ -4,11 +4,8 @@ metadata:
   name: http-route-ollama
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: http-route-ollama
+    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/ollama/templates/replication-source.yaml b/clusters/cl01tl/platform/ollama/templates/replication-source.yaml
index 775f8761d..28da228b9 100644
--- a/clusters/cl01tl/platform/ollama/templates/replication-source.yaml
+++ b/clusters/cl01tl/platform/ollama/templates/replication-source.yaml
@@ -4,11 +4,8 @@ metadata:
   name: ollama-web-data-backup-source
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: ollama-web-data-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: ollama-web-data
   trigger:
diff --git a/clusters/cl01tl/platform/ollama/templates/service.yaml b/clusters/cl01tl/platform/ollama/templates/service.yaml
index 9ae241b10..781b6c103 100644
--- a/clusters/cl01tl/platform/ollama/templates/service.yaml
+++ b/clusters/cl01tl/platform/ollama/templates/service.yaml
@@ -4,11 +4,8 @@ metadata:
   name: ollama-pd05wd
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: ollama-pd05wd
+    app.kubernetes.io/name: {{ .Release.Name }}
     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:
@@ -22,11 +19,8 @@ metadata:
   name: stable-diffusion-pd05wd
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: stable-diffusion-pd05wd
+    app.kubernetes.io/name: {{ .Release.Name }}
     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:
diff --git a/clusters/cl01tl/platform/ollama/values.yaml b/clusters/cl01tl/platform/ollama/values.yaml
index 1aa16e939..85a998ba7 100644
--- a/clusters/cl01tl/platform/ollama/values.yaml
+++ b/clusters/cl01tl/platform/ollama/values.yaml
@@ -166,8 +166,6 @@ ollama:
             requests:
               cpu: 10m
               memory: 1Gi
-  serviceAccount:
-    create: true
   service:
     server-1:
       controller: server-1