diff --git a/clusters/cl01tl/helm/sonarr-anime/Chart.lock b/clusters/cl01tl/helm/sonarr-anime/Chart.lock index ce89da3ce..f7e82ca4d 100644 --- a/clusters/cl01tl/helm/sonarr-anime/Chart.lock +++ b/clusters/cl01tl/helm/sonarr-anime/Chart.lock @@ -5,8 +5,5 @@ dependencies: - name: postgres-cluster repository: oci://harbor.alexlebens.net/helm-charts version: 6.17.1 -- name: postgres-cluster - repository: oci://harbor.alexlebens.net/helm-charts - version: 6.17.1 -digest: sha256:f73b2549ec65cc87a5a0e5f0adcc0d5699e1f916fc758e99b85ef1a80c0f92cb -generated: "2025-12-14T17:38:12.781338-06:00" +digest: sha256:2ddc05f41717da527defab965882e9c9dc4e1629384285481c0ef4c6af9829a4 +generated: "2025-12-14T17:43:32.673756-06:00" diff --git a/clusters/cl01tl/helm/sonarr-anime/Chart.yaml b/clusters/cl01tl/helm/sonarr-anime/Chart.yaml index 50687563b..cfced7e25 100644 --- a/clusters/cl01tl/helm/sonarr-anime/Chart.yaml +++ b/clusters/cl01tl/helm/sonarr-anime/Chart.yaml @@ -24,10 +24,6 @@ dependencies: alias: sonarr-anime repository: https://bjw-s-labs.github.io/helm-charts/ version: 4.5.0 - - name: postgres-cluster - alias: postgres-17-cluster - version: 6.17.1 - repository: oci://harbor.alexlebens.net/helm-charts - name: postgres-cluster alias: postgres-18-cluster version: 6.17.1 diff --git a/clusters/cl01tl/helm/sonarr-anime/templates/external-secret.yaml b/clusters/cl01tl/helm/sonarr-anime/templates/external-secret.yaml index 5a0d0e128..240d3fb27 100644 --- a/clusters/cl01tl/helm/sonarr-anime/templates/external-secret.yaml +++ b/clusters/cl01tl/helm/sonarr-anime/templates/external-secret.yaml @@ -54,73 +54,6 @@ spec: metadataPolicy: None property: secret_key ---- -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: sonarr-anime-postgresql-17-cluster-backup-secret - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: sonarr-anime-postgresql-17-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: sonarr-anime-postgresql-17-cluster-backup-secret-garage - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: sonarr-anime-postgresql-17-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 - --- apiVersion: external-secrets.io/v1 kind: ExternalSecret diff --git a/clusters/cl01tl/helm/sonarr-anime/values.yaml b/clusters/cl01tl/helm/sonarr-anime/values.yaml index 00b666e57..b7d09ff53 100644 --- a/clusters/cl01tl/helm/sonarr-anime/values.yaml +++ b/clusters/cl01tl/helm/sonarr-anime/values.yaml @@ -81,72 +81,6 @@ sonarr-anime: main: - path: /mnt/store readOnly: false -postgres-17-cluster: - nameOverride: sonarr4-anime-postgresql-17 - mode: recovery - cluster: - enableSuperuserAccess: true - storage: - storageClass: local-path - walStorage: - storageClass: local-path - resources: - requests: - memory: 512Mi - monitoring: - enabled: true - prometheusRule: - enabled: true - initdb: - postInitSQL: - - CREATE DATABASE "sonarr-main" OWNER "app"; - - CREATE DATABASE "sonarr-log" OWNER "app"; - recovery: - method: objectStore - objectStore: - destinationPath: s3://postgres-backups/cl01tl/sonarr-anime/sonarr4-anime-postgresql-17-cluster - endpointURL: http://garage-main.garage:3900 - index: 1 - endpointCredentials: sonarr-anime-postgresql-17-cluster-backup-secret-garage - backup: - objectStore: - - name: external - destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/sonarr4-anime/sonarr4-anime-postgresql-17-cluster - index: 1 - endpointCredentials: sonarr-anime-postgresql-17-cluster-backup-secret - retentionPolicy: "30d" - isWALArchiver: false - - name: garage-local - destinationPath: s3://postgres-backups/cl01tl/sonarr-anime/sonarr4-anime-postgresql-17-cluster - index: 1 - endpointURL: http://garage-main.garage:3900 - endpointCredentials: sonarr-anime-postgresql-17-cluster-backup-secret-garage - endpointCredentialsIncludeRegion: true - retentionPolicy: "3d" - isWALArchiver: true - # - name: garage-remote - # destinationPath: s3://postgres-backups/cl01tl/sonarr-anime/sonarr4-anime-postgresql-17-cluster - # index: 1 - # endpointURL: https://garage-ps10rp.boreal-beaufort.ts.net:3900 - # endpointCredentials: sonarr-anime-postgresql-17-cluster-backup-secret-garage - # retentionPolicy: "30d" - # data: - # compression: bzip2 - # jobs: 2 - scheduledBackups: - - name: daily-backup - suspend: false - 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 - # schedule: "0 30 4 * * SAT" - # backupName: garage-remote postgres-18-cluster: mode: recovery cluster: @@ -171,28 +105,12 @@ postgres-18-cluster: # - CREATE DATABASE "sonarr-main" OWNER "app"; # - CREATE DATABASE "sonarr-log" OWNER "app"; recovery: - method: import + method: objectStore objectStore: destinationPath: s3://postgres-backups/cl01tl/sonarr-anime/sonarr-anime-postgresql-18-cluster endpointURL: http://garage-main.garage:3900 index: 1 endpointCredentials: sonarr-anime-postgresql-18-cluster-backup-secret-garage - import: - type: "monolith" - databases: - - sonarr-main - - sonarr-log - roles: - - app - source: - host: "sonarr4-anime-postgresql-17-cluster-rw" - port: 5432 - username: postgres - database: "*" - sslMode: "disable" - passwordSecret: - name: "sonarr4-anime-postgresql-17-cluster-superuser" - key: "password" backup: objectStore: - name: external