feat: add more

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

@@ -12,3 +12,16 @@ Selector labels
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/part-of: {{ .Release.Name }}
 {{- end }}
+
+{{/*
+NFS names
+*/}}
+{{- define "custom.storageImportNfsName" -}}
+shelfmark-import-nfs-storage
+{{- end -}}
+{{- define "custom.storageAudiobooksNfsName" -}}
+shelfmark-audiobooks-nfs-storage
+{{- end -}}
+{{- define "custom.storageDownloadsNfsName" -}}
+shelfmark-downloads-nfs-storage
+{{- end -}}

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

@@ -1,24 +1,39 @@
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: shelfmark-config-secret
+  name: shelfmark-grimmory-config
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: shelfmark-config-secret
+    app.kubernetes.io/name: shelfmark-grimmory-config
     {{- include "custom.labels" . | nindent 4 }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
-    name: vault
+    name: openbao
   data:
     - secretKey: grimmory-user
       remoteRef:
-        key: /cl01tl/shelfmark/booklore
+        key: /cl01tl/grimmory/users/shelfmark
         property: user
     - secretKey: grimmory-password
       remoteRef:
-        key: /cl01tl/shelfmark/booklore
+        key: /cl01tl/grimmory/users/shelfmark
         property: password
+
+---
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: shelfmark-prowlarr-config
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: shelfmark-prowlarr-config
+    {{- include "custom.labels" . | nindent 4 }}
+spec:
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: openbao
+  data:
     - secretKey: prowlarr-key
       remoteRef:
         key: /cl01tl/prowlarr/key

clusters/cl01tl/helm/shelfmark/templates/persistent-volume-claim.yaml

@@ -1,13 +1,13 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: shelfmark-import-nfs-storage
+  name: {{ include "custom.storageImportNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: shelfmark-import-nfs-storage
+    app.kubernetes.io/name: {{ include "custom.storageImportNfsName" . }}
     {{- include "custom.labels" . | nindent 4 }}
 spec:
-  volumeName: shelfmark-import-nfs-storage
+  volumeName: {{ include "custom.storageImportNfsName" . }}
   storageClassName: nfs-client
   accessModes:
     - ReadWriteMany
@@ -19,13 +19,13 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: shelfmark-audiobooks-nfs-storage
+  name: {{ include "custom.storageAudiobooksNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: shelfmark-audiobooks-nfs-storage
+    app.kubernetes.io/name: {{ include "custom.storageAudiobooksNfsName" . }}
     {{- include "custom.labels" . | nindent 4 }}
 spec:
-  volumeName: shelfmark-audiobooks-nfs-storage
+  volumeName: {{ include "custom.storageAudiobooksNfsName" . }}
   storageClassName: nfs-client
   accessModes:
     - ReadWriteMany
@@ -37,13 +37,13 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: shelfmark-downloads-nfs-storage
+  name: {{ include "custom.storageDownloadsNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: shelfmark-downloads-nfs-storage
+    app.kubernetes.io/name: {{ include "custom.storageDownloadsNfsName" . }}
     {{- include "custom.labels" . | nindent 4 }}
 spec:
-  volumeName: shelfmark-downloads-nfs-storage
+  volumeName: {{ include "custom.storageDownloadsNfsName" . }}
   storageClassName: nfs-client
   accessModes:
     - ReadWriteMany

clusters/cl01tl/helm/shelfmark/templates/persistent-volume.yaml

@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: shelfmark-import-nfs-storage
+  name: {{ include "custom.storageImportNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: shelfmark-import-nfs-storage
+    app.kubernetes.io/name: {{ include "custom.storageImportNfsName" . }}
     {{- include "custom.labels" . | nindent 4 }}
 spec:
   persistentVolumeReclaimPolicy: Retain
@@ -25,10 +25,10 @@ spec:
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: shelfmark-audiobooks-nfs-storage
+  name: {{ include "custom.storageAudiobooksNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: shelfmark-audiobooks-nfs-storage
+    app.kubernetes.io/name: {{ include "custom.storageAudiobooksNfsName" . }}
     {{- include "custom.labels" . | nindent 4 }}
 spec:
   persistentVolumeReclaimPolicy: Retain
@@ -49,10 +49,10 @@ spec:
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: shelfmark-downloads-nfs-storage
+  name: {{ include "custom.storageDownloadsNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: shelfmark-downloads-nfs-storage
+    app.kubernetes.io/name: {{ include "custom.storageDownloadsNfsName" . }}
     {{- include "custom.labels" . | nindent 4 }}
 spec:
   persistentVolumeReclaimPolicy: Retain

clusters/cl01tl/helm/shelfmark/values.yaml

@@ -35,12 +35,12 @@ shelfmark:
             - name: BOOKLORE_USERNAME
               valueFrom:
                 secretKeyRef:
-                  name: shelfmark-config-secret
+                  name: shelfmark-grimmory-config
                   key: grimmory-user
             - name: BOOKLORE_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: shelfmark-config-secret
+                  name: shelfmark-grimmory-config
                   key: grimmory-password
             - name: BOOKLORE_DESTINATION
               value: library
@@ -67,7 +67,7 @@ shelfmark:
             - name: PROWLARR_API_KEY
               valueFrom:
                 secretKeyRef:
-                  name: shelfmark-config-secret
+                  name: shelfmark-prowlarr-config
                   key: prowlarr-key
             - name: ABB_ENABLED
               value: true