feat: add more

2026-04-22 17:44:05 -05:00
parent 6e5435df6d
commit 8282c9a8fb
13 changed files with 74 additions and 75 deletions
--- a/clusters/cl01tl/helm/medialyze/templates/_helpers.tpl
+++ b/clusters/cl01tl/helm/medialyze/templates/_helpers.tpl
@@ -12,3 +12,10 @@ Selector labels
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/part-of: {{ .Release.Name }}
 {{- end }}
+
+{{/*
+NFS names
+*/}}
+{{- define "custom.storageNfsName" -}}
+medialyze-nfs-storage
+{{- end -}}
--- a/clusters/cl01tl/helm/medialyze/templates/persistent-volume-claim.yaml
+++ b/clusters/cl01tl/helm/medialyze/templates/persistent-volume-claim.yaml
@@ -1,13 +1,13 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: medialyze-nfs-storage
+  name: {{ include "custom.storageNfsName" . }}
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: medialyze-nfs-storage
+    app.kubernetes.io/name: {{ include "custom.storageNfsName" . }}
    {{- include "custom.labels" . | nindent 4 }}
 spec:
-  volumeName: medialyze-nfs-storage
+  volumeName: {{ include "custom.storageNfsName" . }}
  storageClassName: nfs-client
  accessModes:
    - ReadWriteMany
--- a/clusters/cl01tl/helm/medialyze/templates/persistent-volume.yaml
+++ b/clusters/cl01tl/helm/medialyze/templates/persistent-volume.yaml
@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: medialyze-nfs-storage
+  name: {{ include "custom.storageNfsName" . }}
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: medialyze-nfs-storage
+    app.kubernetes.io/name: {{ include "custom.storageNfsName" . }}
    {{- include "custom.labels" . | nindent 4 }}
 spec:
  persistentVolumeReclaimPolicy: Retain
--- a/clusters/cl01tl/helm/music-grabber/templates/_helpers.tpl
+++ b/clusters/cl01tl/helm/music-grabber/templates/_helpers.tpl
@@ -12,3 +12,10 @@ Selector labels
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/part-of: {{ .Release.Name }}
 {{- end }}
+
+{{/*
+NFS names
+*/}}
+{{- define "custom.storageNfsName" -}}
+music-grabber-nfs-storage
+{{- end -}}
--- a/clusters/cl01tl/helm/music-grabber/templates/external-secret.yaml
+++ b/clusters/cl01tl/helm/music-grabber/templates/external-secret.yaml
@@ -1,60 +1,29 @@
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: music-grabber-config-secret
+  name: music-grabber-config
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: music-grabber-config-secret
+    app.kubernetes.io/name: music-grabber-config
    {{- include "custom.labels" . | nindent 4 }}
 spec:
  secretStoreRef:
    kind: ClusterSecretStore
-    name: vault
+    name: openbao
  data:
    - secretKey: navidrome-user
      remoteRef:
-        key: /cl01tl/navidrome/admin
+        key: /cl01tl/navidrome/users/admin
        property: user
    - secretKey: navidrome-password
      remoteRef:
-        key: /cl01tl/navidrome/admin
+        key: /cl01tl/navidrome/users/admin
        property: password
    - secretKey: slskd-user
      remoteRef:
-        key: /cl01tl/slskd/auth
+        key: /cl01tl/slskd/users/slskd
        property: user
    - secretKey: slskd-password
      remoteRef:
-        key: /cl01tl/slskd/auth
+        key: /cl01tl/slskd/users/slskd
        property: password
-
---
-apiVersion: external-secrets.io/v1
-kind: ExternalSecret
-metadata:
-  name: music-grabber-wireguard-conf
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: music-grabber-wireguard-conf
-    {{- include "custom.labels" . | nindent 4 }}
-spec:
-  secretStoreRef:
-    kind: ClusterSecretStore
-    name: vault
-  data:
-    - secretKey: private-key
-      remoteRef:
-        key: /airvpn/conf/cl01tl
-        property: private-key
-    - secretKey: preshared-key
-      remoteRef:
-        key: /airvpn/conf/cl01tl
-        property: preshared-key
-    - secretKey: addresses
-      remoteRef:
-        key: /airvpn/conf/cl01tl
-        property: addresses
-    - secretKey: input-ports
-      remoteRef:
-        key: /airvpn/conf/cl01tl
-        property: input-ports
--- a/clusters/cl01tl/helm/music-grabber/templates/persistent-volume-claim.yaml
+++ b/clusters/cl01tl/helm/music-grabber/templates/persistent-volume-claim.yaml
@@ -1,13 +1,13 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: music-grabber-nfs-storage
+  name: {{ include "custom.storageNfsName" . }}
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: music-grabber-nfs-storage
+    app.kubernetes.io/name: {{ include "custom.storageNfsName" . }}
    {{- include "custom.labels" . | nindent 4 }}
 spec:
-  volumeName: music-grabber-nfs-storage
+  volumeName: {{ include "custom.storageNfsName" . }}
  storageClassName: nfs-client
  accessModes:
    - ReadWriteMany
--- a/clusters/cl01tl/helm/music-grabber/templates/persistent-volume.yaml
+++ b/clusters/cl01tl/helm/music-grabber/templates/persistent-volume.yaml
@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: music-grabber-nfs-storage
+  name: {{ include "custom.storageNfsName" . }}
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: music-grabber-nfs-storage
+    app.kubernetes.io/name: {{ include "custom.storageNfsName" . }}
    {{- include "custom.labels" . | nindent 4 }}
 spec:
  persistentVolumeReclaimPolicy: Retain
--- a/clusters/cl01tl/helm/navidrome/templates/_helpers.tpl
+++ b/clusters/cl01tl/helm/navidrome/templates/_helpers.tpl
@@ -12,3 +12,19 @@ Selector labels
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/part-of: {{ .Release.Name }}
 {{- end }}
+
+{{/*
+NFS names
+*/}}
+{{- define "custom.storageMusicNfsName" -}}
+navidrome-music-nfs-storage
+{{- end -}}
+{{- define "custom.storageMusicYoutubeNfsName" -}}
+navidrome-music-youtube-nfs-storage
+{{- end -}}
+{{- define "custom.storageMusicGrabberNfsName" -}}
+navidrome-music-grabber-nfs-storage
+{{- end -}}
+{{- define "custom.storageMusicSingleNfsName" -}}
+navidrome-music-single-nfs-storage
+{{- end -}}
--- a/clusters/cl01tl/helm/navidrome/templates/persistent-volume-claim.yaml
+++ b/clusters/cl01tl/helm/navidrome/templates/persistent-volume-claim.yaml
@@ -1,13 +1,13 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: navidrome-music-nfs-storage
+  name: {{ include "custom.storageMusicNfsName" . }}
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: navidrome-music-nfs-storage
+    app.kubernetes.io/name: {{ include "custom.storageMusicNfsName" . }}
    {{- include "custom.labels" . | nindent 4 }}
 spec:
-  volumeName: navidrome-music-nfs-storage
+  volumeName: {{ include "custom.storageMusicNfsName" . }}
  storageClassName: nfs-client
  accessModes:
    - ReadWriteMany
@@ -19,13 +19,13 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: navidrome-music-youtube-nfs-storage
+  name: {{ include "custom.storageMusicYoutubeNfsName" . }}
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: navidrome-music-youtube-nfs-storage
+    app.kubernetes.io/name: {{ include "custom.storageMusicYoutubeNfsName" . }}
    {{- include "custom.labels" . | nindent 4 }}
 spec:
-  volumeName: navidrome-music-youtube-nfs-storage
+  volumeName: {{ include "custom.storageMusicYoutubeNfsName" . }}
  storageClassName: nfs-client
  accessModes:
    - ReadWriteMany
@@ -37,13 +37,13 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: navidrome-music-grabber-nfs-storage
+  name: {{ include "custom.storageMusicGrabberNfsName" . }}
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: navidrome-music-grabber-nfs-storage
+    app.kubernetes.io/name: {{ include "custom.storageMusicGrabberNfsName" . }}
    {{- include "custom.labels" . | nindent 4 }}
 spec:
-  volumeName: navidrome-music-grabber-nfs-storage
+  volumeName: {{ include "custom.storageMusicGrabberNfsName" . }}
  storageClassName: nfs-client
  accessModes:
    - ReadWriteMany
@@ -55,13 +55,13 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: navidrome-music-single-nfs-storage
+  name: {{ include "custom.storageMusicSingleNfsName" . }}
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: navidrome-music-single-nfs-storage
+    app.kubernetes.io/name: {{ include "custom.storageMusicSingleNfsName" . }}
    {{- include "custom.labels" . | nindent 4 }}
 spec:
-  volumeName: navidrome-music-single-nfs-storage
+  volumeName: {{ include "custom.storageMusicSingleNfsName" . }}
  storageClassName: nfs-client
  accessModes:
    - ReadWriteMany
--- a/clusters/cl01tl/helm/navidrome/templates/persistent-volume.yaml
+++ b/clusters/cl01tl/helm/navidrome/templates/persistent-volume.yaml
@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: navidrome-music-nfs-storage
+  name: {{ include "custom.storageMusicNfsName" . }}
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: navidrome-music-nfs-storage
+    app.kubernetes.io/name: {{ include "custom.storageMusicNfsName" . }}
    {{- include "custom.labels" . | nindent 4 }}
 spec:
  persistentVolumeReclaimPolicy: Retain
@@ -25,10 +25,10 @@ spec:
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: navidrome-music-youtube-nfs-storage
+  name: {{ include "custom.storageMusicYoutubeNfsName" . }}
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: navidrome-music-youtube-nfs-storage
+    app.kubernetes.io/name: {{ include "custom.storageMusicYoutubeNfsName" . }}
    {{- include "custom.labels" . | nindent 4 }}
 spec:
  persistentVolumeReclaimPolicy: Retain
@@ -49,10 +49,10 @@ spec:
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: navidrome-music-grabber-nfs-storage
+  name: {{ include "custom.storageMusicGrabberNfsName" . }}
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: navidrome-music-grabber-nfs-storage
+    app.kubernetes.io/name: {{ include "custom.storageMusicGrabberNfsName" . }}
    {{- include "custom.labels" . | nindent 4 }}
 spec:
  persistentVolumeReclaimPolicy: Retain
@@ -73,10 +73,10 @@ spec:
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: navidrome-music-single-nfs-storage
+  name: {{ include "custom.storageMusicSingleNfsName" . }}
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: navidrome-music-single-nfs-storage
+    app.kubernetes.io/name: {{ include "custom.storageMusicSingleNfsName" . }}
    {{- include "custom.labels" . | nindent 4 }}
 spec:
  persistentVolumeReclaimPolicy: Retain
--- a/clusters/cl01tl/helm/node-feature-discovery/templates/namespace.yaml
+++ b/clusters/cl01tl/helm/node-feature-discovery/templates/namespace.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: node-feature-discovery
+  name: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: node-feature-discovery
+    app.kubernetes.io/name: {{ .Release.Namespace }}
    {{- include "custom.labels" . | nindent 4 }}
    pod-security.kubernetes.io/audit: privileged
    pod-security.kubernetes.io/enforce: privileged
--- a/clusters/cl01tl/helm/ntfy/templates/external-secret.yaml
+++ b/clusters/cl01tl/helm/ntfy/templates/external-secret.yaml
@@ -1,17 +1,17 @@
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: ntfy-config-secret
+  name: ntfy-config
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: ntfy-config-secret
+    app.kubernetes.io/name: ntfy-config
    {{- include "custom.labels" . | nindent 4 }}
 spec:
  secretStoreRef:
    kind: ClusterSecretStore
-    name: vault
+    name: openbao
  data:
    - secretKey: attachment-cache-dir
      remoteRef:
        key: /garage/home-infra/ntfy-attachments
-        property: attachment-cache-dir
+        property: S3_URI
--- a/clusters/cl01tl/helm/ntfy/values.yaml
+++ b/clusters/cl01tl/helm/ntfy/values.yaml
@@ -29,7 +29,7 @@ ntfy:
            - name: NTFY_ATTACHMENT_CACHE_DIR
              valueFrom:
                secretKeyRef:
-                  name: ntfy-config-secret
+                  name: ntfy-config
                  key: attachment-cache-dir
            - name: NTFY_ATTACHMENT_TOTAL_SIZE_LIMIT
              value: 10G