diff --git a/clusters/cl01tl/helm/sonarr-4k/Chart.lock b/clusters/cl01tl/helm/sonarr-4k/Chart.lock index 57ba4e5cd..32ea6e78f 100644 --- a/clusters/cl01tl/helm/sonarr-4k/Chart.lock +++ b/clusters/cl01tl/helm/sonarr-4k/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:3f618cf61146654048341de31227b16b6f0485c07bfed9c8709a7af2b614c060 -generated: "2025-12-14T17:22:18.869262-06:00" +digest: sha256:6fe460c379441cc37266b500bbe36171903d11f67122a108d18f9b32600a2d0e +generated: "2025-12-14T17:26:14.77525-06:00" diff --git a/clusters/cl01tl/helm/sonarr-4k/Chart.yaml b/clusters/cl01tl/helm/sonarr-4k/Chart.yaml index 2682a9668..ab4067a06 100644 --- a/clusters/cl01tl/helm/sonarr-4k/Chart.yaml +++ b/clusters/cl01tl/helm/sonarr-4k/Chart.yaml @@ -25,10 +25,6 @@ dependencies: alias: sonarr-4k 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-4k/templates/external-secret.yaml b/clusters/cl01tl/helm/sonarr-4k/templates/external-secret.yaml index 766b8efa2..75f4e5a97 100644 --- a/clusters/cl01tl/helm/sonarr-4k/templates/external-secret.yaml +++ b/clusters/cl01tl/helm/sonarr-4k/templates/external-secret.yaml @@ -54,73 +54,6 @@ spec: metadataPolicy: None property: secret_key ---- -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: sonarr-4k-postgresql-17-cluster-backup-secret - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: sonarr-4k-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-4k-postgresql-17-cluster-backup-secret-garage - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: sonarr-4k-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-4k/values.yaml b/clusters/cl01tl/helm/sonarr-4k/values.yaml index 7d5d7550b..74cbe5599 100644 --- a/clusters/cl01tl/helm/sonarr-4k/values.yaml +++ b/clusters/cl01tl/helm/sonarr-4k/values.yaml @@ -81,72 +81,6 @@ sonarr-4k: main: - path: /mnt/store readOnly: false -postgres-17-cluster: - nameOverride: sonarr4-4k-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-4k/sonarr4-4k-postgresql-17-cluster - endpointURL: http://garage-main.garage:3900 - index: 1 - endpointCredentials: sonarr-4k-postgresql-17-cluster-backup-secret-garage - backup: - objectStore: - - name: external - destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/sonarr4-4k/sonarr4-4k-postgresql-17-cluster - index: 1 - endpointCredentials: sonarr-4k-postgresql-17-cluster-backup-secret - retentionPolicy: "30d" - isWALArchiver: false - - name: garage-local - destinationPath: s3://postgres-backups/cl01tl/sonarr-4k/sonarr4-4k-postgresql-17-cluster - index: 1 - endpointURL: http://garage-main.garage:3900 - endpointCredentials: sonarr-4k-postgresql-17-cluster-backup-secret-garage - endpointCredentialsIncludeRegion: true - retentionPolicy: "3d" - isWALArchiver: true - # - name: garage-remote - # destinationPath: s3://postgres-backups/cl01tl/sonarr-4k/sonarr4-4k-postgresql-17-cluster - # index: 1 - # endpointURL: https://garage-ps10rp.boreal-beaufort.ts.net:3900 - # endpointCredentials: sonarr-4k-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 28 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-4k/sonarr-4k-postgresql-18-cluster endpointURL: http://garage-main.garage:3900 index: 1 endpointCredentials: sonarr-4k-postgresql-18-cluster-backup-secret-garage - import: - type: "monolith" - databases: - - sonarr-main - - sonarr-log - roles: - - app - source: - host: "sonarr4-4k-postgresql-17-cluster-rw" - port: 5432 - username: postgres - database: "*" - sslMode: "disable" - passwordSecret: - name: "sonarr4-4k-postgresql-17-cluster-superuser" - key: "password" backup: objectStore: - name: external