feat: convert many

clusters/cl01tl/helm/homepage/templates/_helpers.tpl

@@ -0,0 +1,21 @@
+{{/*
+Common labels
+*/}}
+{{- define "custom.labels" -}}
+{{ include "custom.selectorLabels" $ }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "custom.selectorLabels" -}}
+app.kubernetes.io/instance: {{ .Release.Name }}
+app.kubernetes.io/part-of: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+CluserRole Name
+*/}}
+{{- define "custom.clusterRoleName" -}}
+homepage
+{{- end -}}

clusters/cl01tl/helm/homepage/templates/cluster-role-binding.yaml

@@ -1,16 +1,15 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: homepage
+  name: {{ include "custom.clusterRoleName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: homepage
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ include "custom.clusterRoleName" . }}
+    {{- include "custom.labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: homepage
+  name: {{ include "custom.clusterRoleName" . }}
 subjects:
   - kind: ServiceAccount
     name: homepage

clusters/cl01tl/helm/homepage/templates/cluster-role.yaml

@@ -1,12 +1,11 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: homepage
+  name: {{ include "custom.clusterRoleName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: homepage
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ include "custom.clusterRoleName" . }}
+    {{- include "custom.labels" . | nindent 4 }}
 rules:
   - apiGroups:
       - ""

clusters/cl01tl/helm/homepage/templates/external-secret.yaml

@@ -1,20 +1,19 @@
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: homepage-keys-secret
+  name: homepage-secrets
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: homepage-keys-secret
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: homepage-secrets
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
-    name: vault
+    name: openbao
   data:
     - secretKey: HOMEPAGE_VAR_GITEA_API_TOKEN
       remoteRef:
-        key: /cl01tl/gitea/auth/homepage
+        key: /cl01tl/gitea/users/bot
         property: token
     - secretKey: HOMEPAGE_VAR_ARGOCD_API_TOKEN
       remoteRef:
@@ -34,47 +33,47 @@ spec:
         property: key
     - secretKey: HOMEPAGE_VAR_SYNOLOGY_USER
       remoteRef:
-        key: /synology/auth/cl01tl
+        key: /synology/users/remote_stats
         property: user
     - secretKey: HOMEPAGE_VAR_SYNOLOGY_PASSWORD
       remoteRef:
-        key: /synology/auth/cl01tl
+        key: /synology/users/remote_stats
         property: password
     - secretKey: HOMEPAGE_VAR_UNIFI_API_KEY
       remoteRef:
-        key: /unifi/auth/cl01tl
+        key: /unifi/users/cl01tl
         property: api-key
     - secretKey: HOMEPAGE_VAR_SONARR_KEY
       remoteRef:
-        key: /cl01tl/sonarr4/key
+        key: /cl01tl/sonarr/key
         property: key
     - secretKey: HOMEPAGE_VAR_SONARR4K_KEY
       remoteRef:
-        key: /cl01tl/sonarr4-4k/key
+        key: /cl01tl/sonarr-4k/key
         property: key
     - secretKey: HOMEPAGE_VAR_SONARRANIME_KEY
       remoteRef:
-        key: /cl01tl/sonarr4-anime/key
+        key: /cl01tl/sonarr-anime/key
         property: key
     - secretKey: HOMEPAGE_VAR_RADARR_KEY
       remoteRef:
-        key: /cl01tl/radarr5/key
+        key: /cl01tl/radarr/key
         property: key
     - secretKey: HOMEPAGE_VAR_RADARR4K_KEY
       remoteRef:
-        key: /cl01tl/radarr5-4k/key
+        key: /cl01tl/radarr-4k/key
         property: key
     - secretKey: HOMEPAGE_VAR_RADARRANIME_KEY
       remoteRef:
-        key: /cl01tl/radarr5-anime/key
+        key: /cl01tl/radarr-anime/key
         property: key
     - secretKey: HOMEPAGE_VAR_RADARRSTANDUP_KEY
       remoteRef:
-        key: /cl01tl/radarr5-standup/key
+        key: /cl01tl/radarr-standup/key
         property: key
     - secretKey: HOMEPAGE_VAR_LIDARR_KEY
       remoteRef:
-        key: /cl01tl/lidarr2/key
+        key: /cl01tl/lidarr/key
         property: key
     - secretKey: HOMEPAGE_VAR_PROWLARR_KEY
       remoteRef:

clusters/cl01tl/helm/homepage/values.yaml

@@ -22,7 +22,7 @@ homepage:
               value: home.alexlebens.net
           envFrom:
             - secretRef:
-                name: homepage-keys-secret
+                name: homepage-secrets
           resources:
             requests:
               cpu: 1m