From 5fa2b411eed144f7694d8c7335b9451e447941dd Mon Sep 17 00:00:00 2001
From: MichaelFisher1997 <contact@michaelfisher.tech>
Date: Thu, 26 Mar 2026 00:33:04 +0000
Subject: [PATCH] fix: Fix Cluster CR schema - use barmanObjectStore instead of
 b2

---
 .../addons/cnpg/postgres-cluster.yaml         | 50 ++++++++++++-------
 1 file changed, 31 insertions(+), 19 deletions(-)

diff --git a/infrastructure/addons/cnpg/postgres-cluster.yaml b/infrastructure/addons/cnpg/postgres-cluster.yaml
index 1e4cc95..44e9c11 100644
--- a/infrastructure/addons/cnpg/postgres-cluster.yaml
+++ b/infrastructure/addons/cnpg/postgres-cluster.yaml
@@ -14,7 +14,6 @@ spec:
   storage:
     storageClass: local-path
     size: 50Gi
-    resizeStorageStorageClassName: local-path
 
   resources:
     requests:
@@ -26,28 +25,41 @@ spec:
 
   bootstrap:
     recovery:
-      externalClusters:
-        - name: b2-backup
-          s3Compatible:
-            bucket: HetznerTerra
-            region: us-east-005
-            endpoint: s3.us-east-005.backblazeb2.com
-            prefix: rancher-backups/
-            credentials:
-              name: b2-credentials
-              accessKey: B2_ACCOUNT_ID
-              secretKey: B2_APPLICATION_KEY
+      source: b2-backup
+
+  externalClusters:
+    - name: b2-backup
+      barmanObjectStore:
+        bucketName: HetznerTerra
+        region: us-east-005
+        endpoint: https://s3.us-east-005.backblazeb2.com
+        s3Compatible:
+          enabled: true
+        credentials:
+          accessKeyIdSecret:
+            name: b2-credentials
+            key: B2_ACCOUNT_ID
+          secretAccessKeySecret:
+            name: b2-credentials
+            key: B2_APPLICATION_KEY
+        backupPath: rancher-backups/
 
   backup:
-    b2:
-      bucket: HetznerTerra
+    barmanObjectStore:
+      bucketName: HetznerTerra
       region: us-east-005
-      endpoint: s3.us-east-005.backblazeb2.com
-      prefix: rancher-backups/
+      endpoint: https://s3.us-east-005.backblazeb2.com
+      s3Compatible:
+        enabled: true
       credentials:
-        name: b2-credentials
-        accessKey: B2_ACCOUNT_ID
-        secretKey: B2_APPLICATION_KEY
+        accessKeyIdSecret:
+          name: b2-credentials
+          key: B2_ACCOUNT_ID
+        secretAccessKeySecret:
+          name: b2-credentials
+          key: B2_APPLICATION_KEY
+      backupPath: rancher-backups/
+      walPath: rancher-backups/wals
     retentionPolicy: keep14
 
   serviceAccountTemplate: