diff --git a/clusters/cl01tl/helm/photoview/Chart.lock b/clusters/cl01tl/helm/photoview/Chart.lock index 220c3869a..165ae8f17 100644 --- a/clusters/cl01tl/helm/photoview/Chart.lock +++ b/clusters/cl01tl/helm/photoview/Chart.lock @@ -5,8 +5,5 @@ dependencies: - name: postgres-cluster repository: oci://harbor.alexlebens.net/helm-charts version: 6.16.1 -- name: postgres-cluster - repository: oci://harbor.alexlebens.net/helm-charts - version: 6.16.1 -digest: sha256:0b7b24c0944b54a298f262afe3e6f37003d5b62e45aa2ceb99220b3e53446a80 -generated: "2025-12-13T18:21:58.227718-06:00" +digest: sha256:423913abfef9f5dc7a56422dd1fe70f9aba129948b33bb538235333b8a643d6a +generated: "2025-12-13T18:23:58.856756-06:00" diff --git a/clusters/cl01tl/helm/photoview/Chart.yaml b/clusters/cl01tl/helm/photoview/Chart.yaml index 4f94f46ab..2e12ac033 100644 --- a/clusters/cl01tl/helm/photoview/Chart.yaml +++ b/clusters/cl01tl/helm/photoview/Chart.yaml @@ -18,10 +18,6 @@ dependencies: alias: photoview repository: https://bjw-s-labs.github.io/helm-charts/ version: 4.5.0 - - name: postgres-cluster - 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 diff --git a/clusters/cl01tl/helm/photoview/templates/external-secrets.yaml b/clusters/cl01tl/helm/photoview/templates/external-secrets.yaml index d0f168a06..36385fe93 100644 --- a/clusters/cl01tl/helm/photoview/templates/external-secrets.yaml +++ b/clusters/cl01tl/helm/photoview/templates/external-secrets.yaml @@ -1,72 +1,5 @@ apiVersion: external-secrets.io/v1 kind: ExternalSecret -metadata: - name: photoview-postgresql-17-cluster-backup-secret - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: photoview-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: photoview-postgresql-17-cluster-backup-secret-garage - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: photoview-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 metadata: name: photoview-postgresql-18-cluster-backup-secret namespace: {{ .Release.Namespace }} diff --git a/clusters/cl01tl/helm/photoview/values.yaml b/clusters/cl01tl/helm/photoview/values.yaml index cfc32567f..32950e7ab 100644 --- a/clusters/cl01tl/helm/photoview/values.yaml +++ b/clusters/cl01tl/helm/photoview/values.yaml @@ -72,62 +72,6 @@ photoview: main: - path: /photos readOnly: true -postgres-17-cluster: - mode: recovery - cluster: - storage: - storageClass: local-path - walStorage: - storageClass: local-path - monitoring: - enabled: true - prometheusRule: - enabled: true - recovery: - method: objectStore - objectStore: - destinationPath: s3://postgres-backups/cl01tl/photoview/photoview-postgresql-17-cluster - endpointURL: http://garage-main.garage:3900 - index: 1 - endpointCredentials: photoview-postgresql-17-cluster-backup-secret-garage - backup: - objectStore: - - name: external - destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/photoview/photoview-postgresql-17-cluster - index: 1 - retentionPolicy: "30d" - isWALArchiver: false - - name: garage-local - destinationPath: s3://postgres-backups/cl01tl/photoview/photoview-postgresql-17-cluster - index: 1 - endpointURL: http://garage-main.garage:3900 - endpointCredentials: photoview-postgresql-17-cluster-backup-secret-garage - endpointCredentialsIncludeRegion: true - retentionPolicy: "3d" - isWALArchiver: true - # - name: garage-remote - # destinationPath: s3://postgres-backups/cl01tl/photoview/photoview-postgresql-17-cluster - # index: 1 - # endpointURL: https://garage-ps10rp.boreal-beaufort.ts.net:3900 - # endpointCredentials: photoview-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 12 4 * * SAT" - # backupName: garage-remote postgres-18-cluster: mode: recovery cluster: