From 9a4d76ce5ae855b7d168eeaf4b5a3ec4edfa97ea Mon Sep 17 00:00:00 2001
From: Alex Lebens <alexanderlebens@gmail.com>
Date: Fri, 16 May 2025 21:08:47 -0500
Subject: [PATCH] change labels

---
 .../templates/external-secret.yaml            |  13 +-
 .../templates/grafana-dashboard.yaml          | 130 ++++--------------
 .../templates/grafana-datasource.yaml         |  10 +-
 .../templates/grafana-folder.yaml             |  20 +--
 .../grafana-operator/templates/grafana.yaml   |   6 +-
 .../templates/http-route.yaml                 |   5 +-
 6 files changed, 37 insertions(+), 147 deletions(-)

diff --git a/clusters/cl01tl/monitoring/grafana-operator/templates/external-secret.yaml b/clusters/cl01tl/monitoring/grafana-operator/templates/external-secret.yaml
index cb2474c2c..ee76a6b30 100644
--- a/clusters/cl01tl/monitoring/grafana-operator/templates/external-secret.yaml
+++ b/clusters/cl01tl/monitoring/grafana-operator/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
@@ -36,11 +33,8 @@ metadata:
   name: grafana-oauth-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-oauth-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
@@ -68,11 +62,8 @@ metadata:
   name: grafana-operator-postgresql-17-cluster-backup-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-operator-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/monitoring/grafana-operator/templates/grafana-dashboard.yaml b/clusters/cl01tl/monitoring/grafana-operator/templates/grafana-dashboard.yaml
index 71aaf3cb3..f958a3822 100644
--- a/clusters/cl01tl/monitoring/grafana-operator/templates/grafana-dashboard.yaml
+++ b/clusters/cl01tl/monitoring/grafana-operator/templates/grafana-dashboard.yaml
@@ -4,11 +4,8 @@ metadata:
   name: grafana-dashboard-ceph
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-dashboard-ceph
+    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:
   instanceSelector:
     matchLabels:
@@ -26,11 +23,8 @@ metadata:
   name: grafana-dashboard-coredns
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-dashboard-coredns
+    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:
   instanceSelector:
     matchLabels:
@@ -47,11 +41,8 @@ metadata:
   name: grafana-dashboard-etcd
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-dashboard-etcd
+    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:
   instanceSelector:
     matchLabels:
@@ -68,11 +59,8 @@ metadata:
   name: grafana-dashboard-loki
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-dashboard-loki
+    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:
   instanceSelector:
     matchLabels:
@@ -89,11 +77,8 @@ metadata:
   name: grafana-dashboard-node-full
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-dashboard-node-full
+    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:
   instanceSelector:
     matchLabels:
@@ -110,11 +95,8 @@ metadata:
   name: grafana-dashboard-node-short
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-dashboard-node-short
+    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:
   instanceSelector:
     matchLabels:
@@ -131,11 +113,8 @@ metadata:
   name: grafana-dashboard-argocd
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-dashboard-argocd
+    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:
   instanceSelector:
     matchLabels:
@@ -152,11 +131,8 @@ metadata:
   name: grafana-dashboard-blocky
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-dashboard-blocky
+    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:
   instanceSelector:
     matchLabels:
@@ -173,11 +149,8 @@ metadata:
   name: grafana-dashboard-cert-manager
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-dashboard-cert-manager
+    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:
   instanceSelector:
     matchLabels:
@@ -194,11 +167,8 @@ metadata:
   name: grafana-dashboard-cloudnative-pg
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-dashboard-cloudnative-pg
+    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:
   instanceSelector:
     matchLabels:
@@ -215,11 +185,8 @@ metadata:
   name: grafana-dashboard-descheduler
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-dashboard-descheduler
+    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:
   instanceSelector:
     matchLabels:
@@ -236,11 +203,8 @@ metadata:
   name: grafana-dashboard-operator
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-dashboard-operator
+    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:
   instanceSelector:
     matchLabels:
@@ -257,11 +221,8 @@ metadata:
   name: grafana-dashboard-harbor
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-dashboard-harbor
+    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:
   instanceSelector:
     matchLabels:
@@ -279,11 +240,8 @@ metadata:
   name: grafana-dashboard-speedtest-exporter
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-dashboard-speedtest-exporter
+    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:
   instanceSelector:
     matchLabels:
@@ -300,11 +258,8 @@ metadata:
   name: grafana-dashboard-spegel
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-dashboard-spegel
+    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:
   instanceSelector:
     matchLabels:
@@ -321,11 +276,8 @@ metadata:
   name: grafana-dashboard-traefik
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-dashboard-traefik
+    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:
   instanceSelector:
     matchLabels:
@@ -342,11 +294,8 @@ metadata:
   name: grafana-dashboard-trivy
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-dashboard-trivy
+    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:
   instanceSelector:
     matchLabels:
@@ -363,11 +312,8 @@ metadata:
   name: grafana-dashboard-unpoller
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-dashboard-unpoller
+    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:
   instanceSelector:
     matchLabels:
@@ -384,11 +330,8 @@ metadata:
   name: grafana-dashboard-volsync
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-dashboard-volsync
+    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:
   instanceSelector:
     matchLabels:
@@ -405,11 +348,8 @@ metadata:
   name: grafana-dashboard-authentik
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-dashboard-authentik
+    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:
   instanceSelector:
     matchLabels:
@@ -426,11 +366,8 @@ metadata:
   name: grafana-dashboard-gitea
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-dashboard-gitea
+    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:
   instanceSelector:
     matchLabels:
@@ -448,11 +385,8 @@ metadata:
   name: grafana-dashboard-qbittorrent
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-dashboard-qbittorrent
+    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:
   instanceSelector:
     matchLabels:
@@ -469,11 +403,8 @@ metadata:
   name: grafana-dashboard-vault
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-dashboard-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:
   instanceSelector:
     matchLabels:
@@ -490,11 +421,8 @@ metadata:
   name: grafana-dashboard-immich
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-dashboard-immich
+    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:
   instanceSelector:
     matchLabels:
@@ -511,11 +439,8 @@ metadata:
   name: grafana-dashboard-radarr
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-dashboard-radarr
+    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:
   instanceSelector:
     matchLabels:
@@ -532,11 +457,8 @@ metadata:
   name: grafana-dashboard-sonarr
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-dashboard-sonarr
+    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:
   instanceSelector:
     matchLabels:
diff --git a/clusters/cl01tl/monitoring/grafana-operator/templates/grafana-datasource.yaml b/clusters/cl01tl/monitoring/grafana-operator/templates/grafana-datasource.yaml
index b419712bc..563173f25 100644
--- a/clusters/cl01tl/monitoring/grafana-operator/templates/grafana-datasource.yaml
+++ b/clusters/cl01tl/monitoring/grafana-operator/templates/grafana-datasource.yaml
@@ -4,11 +4,8 @@ metadata:
   name: grafana-datasource-prometheus
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-datasource-prometheus
+    app.kubernetes.io/name: {{ .Release.Name }}
     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:
   datasource:
     name: Prometheus
@@ -34,11 +31,8 @@ metadata:
   name: grafana-datasource-loki
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-datasource-loki
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: logs
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   datasource:
     name: Loki
diff --git a/clusters/cl01tl/monitoring/grafana-operator/templates/grafana-folder.yaml b/clusters/cl01tl/monitoring/grafana-operator/templates/grafana-folder.yaml
index 9e870d5fd..6b61587ef 100644
--- a/clusters/cl01tl/monitoring/grafana-operator/templates/grafana-folder.yaml
+++ b/clusters/cl01tl/monitoring/grafana-operator/templates/grafana-folder.yaml
@@ -4,11 +4,8 @@ metadata:
   name: grafana-folder-application
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-folder-application
+    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:
   instanceSelector:
     matchLabels:
@@ -41,11 +38,8 @@ metadata:
   name: grafana-folder-platform
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-folder-platform
+    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:
   instanceSelector:
     matchLabels:
@@ -78,11 +72,8 @@ metadata:
   name: grafana-folder-service
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-folder-service
+    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:
   instanceSelector:
     matchLabels:
@@ -115,11 +106,8 @@ metadata:
   name: grafana-folder-system
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-folder-system
+    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:
   instanceSelector:
     matchLabels:
diff --git a/clusters/cl01tl/monitoring/grafana-operator/templates/grafana.yaml b/clusters/cl01tl/monitoring/grafana-operator/templates/grafana.yaml
index c9b1e2a8c..24a376b91 100644
--- a/clusters/cl01tl/monitoring/grafana-operator/templates/grafana.yaml
+++ b/clusters/cl01tl/monitoring/grafana-operator/templates/grafana.yaml
@@ -4,11 +4,9 @@ metadata:
   name: grafana-main
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: grafana-main
+  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 }}
     app: grafana-main
 spec:
   config:
diff --git a/clusters/cl01tl/monitoring/grafana-operator/templates/http-route.yaml b/clusters/cl01tl/monitoring/grafana-operator/templates/http-route.yaml
index 633ed6979..23abd6dc4 100644
--- a/clusters/cl01tl/monitoring/grafana-operator/templates/http-route.yaml
+++ b/clusters/cl01tl/monitoring/grafana-operator/templates/http-route.yaml
@@ -4,11 +4,8 @@ metadata:
   name: http-route-grafana
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: http-route-grafana
+    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