feat: convert many

2026-04-21 20:47:16 -05:00
parent 9918eb6363
commit e104eae55e
294 changed files with 2095 additions and 1121 deletions
--- a/clusters/cl01tl/helm/grimmory/templates/_helpers.tpl
+++ b/clusters/cl01tl/helm/grimmory/templates/_helpers.tpl
@@ -0,0 +1,24 @@
+{{/*
+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 }}
+
+{{/*
+NFS names
+*/}}
+{{- define "custom.booksNfsName" -}}
+grimmory-books-nfs-storage
+{{- end -}}
+{{- define "custom.booksImportNfsName" -}}
+grimmory-books-import-nfs-storage
+{{- end -}}
--- a/clusters/cl01tl/helm/grimmory/templates/external-secret.yaml
+++ b/clusters/cl01tl/helm/grimmory/templates/external-secret.yaml
@@ -1,42 +1,21 @@
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: grimmory-database-secret
+  name: grimmory-database-config
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: grimmory-database-secret
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: grimmory-database-config
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
  secretStoreRef:
    kind: ClusterSecretStore
-    name: vault
+    name: openbao
  data:
    - secretKey: password
      remoteRef:
        key: /cl01tl/grimmory/database
        property: password

---
-apiVersion: external-secrets.io/v1
-kind: ExternalSecret
-metadata:
-  name: grimmory-data-replication-secret
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: grimmory-data-replication-secret
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-spec:
-  secretStoreRef:
-    kind: ClusterSecretStore
-    name: vault
-  data:
-    - secretKey: psk.txt
-      remoteRef:
-        key: /cl01tl/grimmory/replication
-        property: psk.txt
-
 ---
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
@@ -45,12 +24,11 @@ metadata:
  namespace: {{ .Release.Namespace }}
  labels:
    app.kubernetes.io/name: grimmory-mariadb-cluster-backup-secret-external
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
  secretStoreRef:
    kind: ClusterSecretStore
-    name: vault
+    name: openbao
  data:
    - secretKey: access
      remoteRef:
@@ -69,18 +47,17 @@ metadata:
  namespace: {{ .Release.Namespace }}
  labels:
    app.kubernetes.io/name: grimmory-mariadb-cluster-backup-secret-garage
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
  secretStoreRef:
    kind: ClusterSecretStore
-    name: vault
+    name: openbao
  data:
    - secretKey: access
      remoteRef:
        key: /garage/home-infra/mariadb-backups
-        property: access
+        property: ACCESS_KEY_ID
    - secretKey: secret
      remoteRef:
        key: /garage/home-infra/mariadb-backups
-        property: secret
+        property: ACCESS_SECRET_KEY
--- a/clusters/cl01tl/helm/grimmory/templates/namespace.yaml
+++ b/clusters/cl01tl/helm/grimmory/templates/namespace.yaml
@@ -1,13 +1,7 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: grimmory
-  annotations:
-    volsync.backube/privileged-movers: "true"
+  name: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: grimmory
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-    pod-security.kubernetes.io/audit: privileged
-    pod-security.kubernetes.io/enforce: privileged
-    pod-security.kubernetes.io/warn: privileged
+    app.kubernetes.io/name: {{ .Release.Namespace }}
+    {{- include "custom.labels" . | nindent 4 }}
--- a/clusters/cl01tl/helm/grimmory/templates/persistent-volume-claim.yaml
+++ b/clusters/cl01tl/helm/grimmory/templates/persistent-volume-claim.yaml
@@ -1,14 +1,13 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: grimmory-books-nfs-storage
+  name: {{ include "custom.booksNfsName" . }}
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: grimmory-books-nfs-storage
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ include "custom.booksNfsName" . }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
-  volumeName: grimmory-books-nfs-storage
+  volumeName: {{ include "custom.booksNfsName" . }}
  storageClassName: nfs-client
  accessModes:
    - ReadWriteMany
@@ -20,14 +19,13 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: grimmory-books-import-nfs-storage
+  name: {{ include "custom.booksImportNfsName" . }}
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: grimmory-books-import-nfs-storage
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ include "custom.booksImportNfsName" . }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
-  volumeName: grimmory-books-import-nfs-storage
+  volumeName: {{ include "custom.booksImportNfsName" . }}
  storageClassName: nfs-client
  accessModes:
    - ReadWriteMany
--- a/clusters/cl01tl/helm/grimmory/templates/persistent-volume.yaml
+++ b/clusters/cl01tl/helm/grimmory/templates/persistent-volume.yaml
@@ -1,12 +1,11 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: grimmory-books-nfs-storage
+  name: {{ include "custom.booksNfsName" . }}
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: grimmory-books-nfs-storage
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ include "custom.booksNfsName" . }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
  persistentVolumeReclaimPolicy: Retain
  storageClassName: nfs-client
@@ -26,12 +25,11 @@ spec:
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: grimmory-books-import-nfs-storage
+  name: {{ include "custom.booksImportNfsName" . }}
  namespace: {{ .Release.Namespace }}
  labels:
-    app.kubernetes.io/name: grimmory-books-import-nfs-storage
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ include "custom.booksImportNfsName" . }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
  persistentVolumeReclaimPolicy: Retain
  storageClassName: nfs-client
@@ -40,7 +38,7 @@ spec:
  accessModes:
    - ReadWriteMany
  nfs:
-    path: /volume2/Storage/Books Import
+    path: '/volume2/Storage/Books Import'
    server: synologybond.alexlebens.net
  mountOptions:
    - vers=4
--- a/clusters/cl01tl/helm/grimmory/values.yaml
+++ b/clusters/cl01tl/helm/grimmory/values.yaml
@@ -27,7 +27,7 @@ grimmory:
            - name: DATABASE_PASSWORD
              valueFrom:
                secretKeyRef:
-                  name: grimmory-database-secret
+                  name: grimmory-database-config
                  key: password
            - name: GRIMMORY_PORT
              value: 6060
@@ -98,7 +98,7 @@ mariadb-cluster:
  mariadb:
    rootPasswordSecretKeyRef:
      generate: false
-      name: grimmory-database-secret
+      name: grimmory-database-config
      key: password
    storage:
      size: 5Gi