diff --git a/clusters/cl01tl/helm/lidarr/Chart.lock b/clusters/cl01tl/helm/lidarr/Chart.lock index 6d739b143..e5bb7499b 100644 --- a/clusters/cl01tl/helm/lidarr/Chart.lock +++ b/clusters/cl01tl/helm/lidarr/Chart.lock @@ -5,5 +5,8 @@ dependencies: - name: postgres-cluster repository: oci://harbor.alexlebens.net/helm-charts version: 6.16.1 -digest: sha256:e13dd5117332240d6a3127ebd18ebc478014b87291b7807e48471980c439fd16 -generated: "2025-12-05T17:07:59.963348904Z" +- name: postgres-cluster + repository: oci://harbor.alexlebens.net/helm-charts + version: 6.16.1 +digest: sha256:5c89f1e4740e1bc0433f097457de8094e1c2f7fbf71e09ed287085276675452e +generated: "2025-12-12T16:31:37.585584-06:00" diff --git a/clusters/cl01tl/helm/lidarr/Chart.yaml b/clusters/cl01tl/helm/lidarr/Chart.yaml index 8f1b97d8f..280353f98 100644 --- a/clusters/cl01tl/helm/lidarr/Chart.yaml +++ b/clusters/cl01tl/helm/lidarr/Chart.yaml @@ -26,5 +26,9 @@ dependencies: alias: postgres-17-cluster version: 6.16.1 repository: oci://harbor.alexlebens.net/helm-charts + - name: postgres-cluster + alias: postgres-18-cluster + version: 6.16.1 + repository: oci://harbor.alexlebens.net/helm-charts icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/lidarr.png -appVersion: 2.13.3 +appVersion: 2.14.5 diff --git a/clusters/cl01tl/helm/lidarr/templates/external-secret.yaml b/clusters/cl01tl/helm/lidarr/templates/external-secret.yaml index 28bf735e3..03d9b8af1 100644 --- a/clusters/cl01tl/helm/lidarr/templates/external-secret.yaml +++ b/clusters/cl01tl/helm/lidarr/templates/external-secret.yaml @@ -120,3 +120,70 @@ spec: key: /garage/home-infra/postgres-backups metadataPolicy: None property: ACCESS_REGION + +--- +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: lidarr-postgresql-18-cluster-backup-secret + namespace: {{ .Release.Namespace }} + labels: + app.kubernetes.io/name: lidarr-postgresql-18-cluster-backup-secret + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/part-of: {{ .Release.Name }} +spec: + secretStoreRef: + kind: ClusterSecretStore + name: vault + data: + - secretKey: ACCESS_KEY_ID + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /digital-ocean/home-infra/postgres-backups + metadataPolicy: None + property: access + - secretKey: ACCESS_SECRET_KEY + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /digital-ocean/home-infra/postgres-backups + metadataPolicy: None + property: secret + +--- +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: lidarr-postgresql-18-cluster-backup-secret-garage + namespace: {{ .Release.Namespace }} + labels: + app.kubernetes.io/name: lidarr-postgresql-18-cluster-backup-secret-garage + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/part-of: {{ .Release.Name }} +spec: + secretStoreRef: + kind: ClusterSecretStore + name: vault + data: + - secretKey: ACCESS_KEY_ID + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /garage/home-infra/postgres-backups + metadataPolicy: None + property: ACCESS_KEY_ID + - secretKey: ACCESS_SECRET_KEY + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /garage/home-infra/postgres-backups + metadataPolicy: None + property: ACCESS_SECRET_KEY + - secretKey: ACCESS_REGION + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /garage/home-infra/postgres-backups + metadataPolicy: None + property: ACCESS_REGION diff --git a/clusters/cl01tl/helm/lidarr/values.yaml b/clusters/cl01tl/helm/lidarr/values.yaml index e66609fd5..e1ab7ce34 100644 --- a/clusters/cl01tl/helm/lidarr/values.yaml +++ b/clusters/cl01tl/helm/lidarr/values.yaml @@ -149,3 +149,87 @@ postgres-17-cluster: # suspend: false # schedule: "0 8 4 * * SAT" # backupName: garage-remote +postgres-18-cluster: + mode: recovery + cluster: + image: + repository: ghcr.io/cloudnative-pg/postgresql + tag: 18.1-standard-trixie + storage: + storageClass: local-path + walStorage: + storageClass: local-path + monitoring: + enabled: true + prometheusRule: + enabled: true + resources: + requests: + memory: 1Gi + cpu: 200m + initdb: + postInitSQL: + - CREATE DATABASE "lidarr-main" OWNER "app"; + - CREATE DATABASE "lidarr-log" OWNER "app"; + recovery: + method: import + objectStore: + destinationPath: s3://postgres-backups/cl01tl/lidarr/lidarr-postgresql-18-cluster + endpointURL: http://garage-main.garage:3900 + index: 1 + endpointCredentials: lidarr-postgresql-18-cluster-backup-secret + import: + type: "microservice" + databases: + - lidarr-main + - lidarr-log + source: + host: "lidarr2-postgresql-17-cluster-rw" + port: 5432 + username: app + database: app + sslMode: "disable" + passwordSecret: + name: "lidarr2-postgresql-17-cluster-app" + key: "password" + backup: + objectStore: + - name: external + destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/lidarr/lidarr-postgresql-18-cluster + index: 1 + endpointCredentials: lidarr-postgresql-18-cluster-backup-secret + retentionPolicy: "30d" + isWALArchiver: false + - name: garage-local + destinationPath: s3://postgres-backups/cl01tl/lidarr/lidarr-postgresql-18-cluster + index: 1 + endpointURL: http://garage-main.garage:3900 + endpointCredentials: lidarr-postgresql-18-cluster-backup-secret-garage + endpointCredentialsIncludeRegion: true + retentionPolicy: "3d" + isWALArchiver: true + # - name: garage-remote + # destinationPath: s3://postgres-backups/cl01tl/lidarr/lidarr-postgresql-18-cluster + # index: 1 + # endpointURL: https://garage-ps10rp.boreal-beaufort.ts.net:3900 + # endpointCredentials: lidarr-postgresql-18-cluster-backup-secret-garage + # retentionPolicy: "30d" + # data: + # compression: bzip2 + # jobs: 2 + scheduledBackups: + - name: daily-backup + suspend: false + immediate: true + schedule: "0 0 0 * * *" + backupName: external + - name: live-backup + suspend: false + immediate: true + schedule: "0 0 0 * * *" + backupName: garage-local + # - name: weekly-backup + # suspend: false + # immediate: true + # schedule: "0 8 4 * * SAT" + # backupName: garage-remote