From 6ae1fec9f370b878be196bdb45760dcddb211979 Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <daniel@brunner.ninja>
Date: Sun, 25 Oct 2026 12:40:05 +0100
Subject: [PATCH] Cut Ombi over to CloudNativePG

---
 .../backup/postgresql/ombi/kustomization.yaml | 11 +++----
 apps/ombi-postgresql/values.yaml              | 32 -------------------
 bootstrap/ombi-postgresql.yaml                | 15 +++------
 3 files changed, 9 insertions(+), 49 deletions(-)
 delete mode 100644 apps/ombi-postgresql/values.yaml

diff --git a/apps/backup/postgresql/ombi/kustomization.yaml b/apps/backup/postgresql/ombi/kustomization.yaml
index 2d40b7d..737fdcd 100644
--- a/apps/backup/postgresql/ombi/kustomization.yaml
+++ b/apps/backup/postgresql/ombi/kustomization.yaml
@@ -19,11 +19,10 @@ patches:
                   - name: pg-dump
                     env:
                       - {name: BACKUP_TARGET, value: ombi}
-                      - {name: BACKUP_MODE, value: database}
-                      - {name: PGHOST, value: postgresql}
+                      - {name: BACKUP_MODE, value: all}
+                      - {name: PGHOST, value: ombi-cnpg-rw}
                       - name: PGUSER
-                        valueFrom: {secretKeyRef: {name: ombi-postgresql, key: USERDB_USER}}
-                      - name: PGDATABASE
-                        valueFrom: {secretKeyRef: {name: ombi-postgresql, key: USERDB_NAME}}
+                        value: postgres
+                      - {name: PGDATABASE, value: postgres}
                       - name: PGPASSWORD
-                        valueFrom: {secretKeyRef: {name: ombi-postgresql, key: USERDB_PASSWORD}}
+                        valueFrom: {secretKeyRef: {name: ombi-cnpg-superuser, key: password}}
diff --git a/apps/ombi-postgresql/values.yaml b/apps/ombi-postgresql/values.yaml
deleted file mode 100644
index bdcd485..0000000
--- a/apps/ombi-postgresql/values.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-settings:
-  existingSecret: ombi-postgresql
-  superuser:
-    secretKey: POSTGRES_USER
-  superuserPassword:
-    secretKey: POSTGRES_PASSWORD
-
-userDatabase:
-  existingSecret: ombi-postgresql
-  name:
-    secretKey: USERDB_NAME
-  user:
-    secretKey: USERDB_USER
-  password:
-    secretKey: USERDB_PASSWORD
-
-customScripts:
-  02-ombi-databases.sql: |
-    CREATE DATABASE "ombi-settings" OWNER ombi;
-    CREATE DATABASE "ombi-external" OWNER ombi;
-
-storage:
-  requestedSize: 5Gi
-  className: rook-ceph-block
-  persistentVolumeClaimRetentionPolicy:
-    whenDeleted: Retain
-    whenScaled: Retain
-
-resources:
-  requests:
-    cpu: 100m
-    memory: 512Mi
diff --git a/bootstrap/ombi-postgresql.yaml b/bootstrap/ombi-postgresql.yaml
index 6f9ee53..05895ea 100644
--- a/bootstrap/ombi-postgresql.yaml
+++ b/bootstrap/ombi-postgresql.yaml
@@ -7,24 +7,17 @@ metadata:
     argocd.argoproj.io/sync-wave: "0"
 spec:
   project: ombi
-  sources:
-  - repoURL: https://groundhog2k.github.io/helm-charts/
-    chart: postgres
-    targetRevision: 1.5.14
-    helm:
-      releaseName: postgresql
-      valueFiles:
-      - $values/apps/ombi-postgresql/values.yaml
-  - repoURL: https://code.brunner.ninja/feedc0de/homelab-gitops.git
+  source:
+    repoURL: https://code.brunner.ninja/feedc0de/homelab-gitops.git
     targetRevision: main
-    ref: values
+    path: apps/ombi-postgresql/service
   destination:
     server: https://kubernetes.default.svc
     namespace: ombi
   syncPolicy:
     automated:
       enabled: true
-      prune: false
+      prune: true
       selfHeal: true
     syncOptions:
     - CreateNamespace=true