From 6957f11bf6eb6de5746d35838fabdce2a8f067df Mon Sep 17 00:00:00 2001 From: Alex Lebens Date: Thu, 11 Dec 2025 17:00:50 -0600 Subject: [PATCH] add new cluster --- clusters/cl01tl/helm/freshrss/Chart.lock | 7 +- clusters/cl01tl/helm/freshrss/Chart.yaml | 6 +- .../freshrss/templates/external-secret.yaml | 67 +++++++++++++++++ clusters/cl01tl/helm/freshrss/values.yaml | 74 +++++++++++++++++++ 4 files changed, 151 insertions(+), 3 deletions(-) diff --git a/clusters/cl01tl/helm/freshrss/Chart.lock b/clusters/cl01tl/helm/freshrss/Chart.lock index 1dc2d8533..403374172 100644 --- a/clusters/cl01tl/helm/freshrss/Chart.lock +++ b/clusters/cl01tl/helm/freshrss/Chart.lock @@ -8,5 +8,8 @@ dependencies: - name: postgres-cluster repository: oci://harbor.alexlebens.net/helm-charts version: 6.16.1 -digest: sha256:d4b26fd1608a0c767c6ebb226173cef133ed53f45098851713121e429bc614a1 -generated: "2025-12-07T02:54:39.594902963Z" +- name: postgres-cluster + repository: oci://harbor.alexlebens.net/helm-charts + version: 6.16.1 +digest: sha256:a13d87f9252f4225f2aae3c5b1366a004bd5034da2267419f7b993a75e3c5f04 +generated: "2025-12-11T17:00:09.969455-06:00" diff --git a/clusters/cl01tl/helm/freshrss/Chart.yaml b/clusters/cl01tl/helm/freshrss/Chart.yaml index d01640de5..0b3ceaff3 100644 --- a/clusters/cl01tl/helm/freshrss/Chart.yaml +++ b/clusters/cl01tl/helm/freshrss/Chart.yaml @@ -29,5 +29,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/freshrss.png -appVersion: 1.26.2 +appVersion: 1.27.1 diff --git a/clusters/cl01tl/helm/freshrss/templates/external-secret.yaml b/clusters/cl01tl/helm/freshrss/templates/external-secret.yaml index c604c9e81..1e3be0ab9 100644 --- a/clusters/cl01tl/helm/freshrss/templates/external-secret.yaml +++ b/clusters/cl01tl/helm/freshrss/templates/external-secret.yaml @@ -217,3 +217,70 @@ spec: key: /garage/home-infra/postgres-backups metadataPolicy: None property: ACCESS_REGION + +--- +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: freshrss-postgresql-18-cluster-backup-secret + namespace: {{ .Release.Namespace }} + labels: + app.kubernetes.io/name: freshrss-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: freshrss-postgresql-18-cluster-backup-secret-garage + namespace: {{ .Release.Namespace }} + labels: + app.kubernetes.io/name: freshrss-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/freshrss/values.yaml b/clusters/cl01tl/helm/freshrss/values.yaml index 94ba72544..ba5734fa4 100644 --- a/clusters/cl01tl/helm/freshrss/values.yaml +++ b/clusters/cl01tl/helm/freshrss/values.yaml @@ -249,3 +249,77 @@ postgres-17-cluster: # suspend: false # schedule: "0 2 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 + recovery: + method: import + # objectStore: + # destinationPath: s3://postgres-backups/cl01tl/freshrss/freshrss-postgresql-18-cluster + # endpointURL: http://garage-main.garage:3900 + # index: 1 + # endpointCredentials: freshrss-postgresql-18-cluster-backup-secret-garage + import: + type: "microservice" + databases: + - app + source: + host: "freshrss-postgresql-17-cluster-rw" + port: 5432 + username: app + database: app + sslMode: "disable" + passwordSecret: + name: "freshrss-postgresql-17-cluster-app" + key: "password" + backup: + objectStore: + - name: external + destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/freshrss/freshrss-postgresql-18-cluster + index: 1 + retentionPolicy: "30d" + isWALArchiver: false + - name: garage-local + destinationPath: s3://postgres-backups/cl01tl/freshrss/freshrss-postgresql-18-cluster + index: 1 + endpointURL: http://garage-main.garage:3900 + endpointCredentials: freshrss-postgresql-18-cluster-backup-secret-garage + endpointCredentialsIncludeRegion: true + retentionPolicy: "3d" + isWALArchiver: true + # - name: garage-remote + # destinationPath: s3://postgres-backups/cl01tl/freshrss/freshrss-postgresql-18-cluster + # index: 1 + # endpointURL: https://garage-ps10rp.boreal-beaufort.ts.net:3900 + # endpointCredentials: freshrss-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 2 4 * * SAT" + # backupName: garage-remote