From 6ab984cacf5b54ca3f6cccf8f1822db997176f34 Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Tue, 9 Sep 2025 23:27:48 -0500
Subject: [PATCH] Make cluster slightly less robust

---
 manifests/databases/postgres-cluster.yaml | 61 +++++++++++++++++------
 manifests/databases/secrets.yaml          |  4 +-
 manifests/helm/longhorn.yaml              |  6 +++
 3 files changed, 53 insertions(+), 18 deletions(-)

diff --git a/manifests/databases/postgres-cluster.yaml b/manifests/databases/postgres-cluster.yaml
index 5ec9aa9..554959d 100644
--- a/manifests/databases/postgres-cluster.yaml
+++ b/manifests/databases/postgres-cluster.yaml
@@ -3,7 +3,8 @@ kind: Cluster
 metadata:
   name: postgres
 spec:
-  instances: 3
+  instances: 2
+  enablePDB: false
   storage:
     size: 20Gi
   primaryUpdateStrategy: unsupervised
@@ -31,20 +32,48 @@ spec:
         superuser: false
         passwordSecret:
           name: postgres-user-matrix
-  backup:
-    retentionPolicy: "30d"
-    barmanObjectStore:
-      destinationPath: "s3://k3sbackup/postgres"
-      endpointURL: "http://s3.thehellings.lan:9000/"
-      s3Credentials:
-        accessKeyId:
-          name: k3sbackup
-          key: username
-        secretAccessKey:
-          name: k3sbackup
-          key: password
-      wal:
-        compression: gzip
+
+  plugins:
+    - name: barman-cloud.cloudnative-pg.io
+      isWALArchiver: false
+      parameters:
+        barmanObjectName: k3sbackup-objectstore
+
+  # Use this as the target of the bootstrap recovery process
+  # It is important that the `externalClusters` serverName matches
+  # the old name of the original cluster that you are upgrading.
+  # When restoring, set the targetTime to the latest backup that you
+  # want to restore to
+# bootstrap:
+#   recovery:
+#     source: origin
+#     recoveryTarget:
+#       targetTime: "2025-08-25 19:00:40+05"
+# externalClusters:
+#   - name: origin
+#     plugin:
+#       name: barman-cloud.cloudnative-pg.io
+#       parameters:
+#         barmanObjectName: k3sbackup-objectstore
+#         serverName: postgres
+---
+apiVersion: barmancloud.cnpg.io/v1
+kind: ObjectStore
+metadata:
+  name: k3sbackup-objectstore
+spec:
+  configuration:
+    destinationPath: "s3://k3sbackup/postgres"
+    endpointURL: "http://s3.thehellings.lan:9000/"
+    s3Credentials:
+      accessKeyId:
+        name: k3sbackup-secret
+        key: username
+      secretAccessKey:
+        name: k3sbackup-secret
+        key: password
+    wal:
+      compression: gzip
 ---
 apiVersion: postgresql.cnpg.io/v1
 kind: ScheduledBackup
@@ -52,7 +81,7 @@ metadata:
   name: postgres-backup
 spec:
   immediate: true # Create one when this is added to the cluster
-  schedule: "0 0 0 * * *" # Midnight, nightly
+  schedule: "0 1 0 * * *" # 1AM, nightly
   backupOwnerReference: self
   cluster:
     name: postgres
diff --git a/manifests/databases/secrets.yaml b/manifests/databases/secrets.yaml
index bca61d8..946b660 100644
--- a/manifests/databases/secrets.yaml
+++ b/manifests/databases/secrets.yaml
@@ -103,11 +103,11 @@ spec:
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: k3sbackup
+  name: k3sbackup-externalsecret
   namespace: db
 spec:
   target:
-    name: k3sbackup
+    name: k3sbackup-secret
     deletionPolicy: Delete
     template:
       type: Opaque
diff --git a/manifests/helm/longhorn.yaml b/manifests/helm/longhorn.yaml
index 0a3952e..5f94899 100644
--- a/manifests/helm/longhorn.yaml
+++ b/manifests/helm/longhorn.yaml
@@ -30,6 +30,12 @@ spec:
   values:
     defaultSettings:
       createDefaultDiskLabeledNodes: true
+    persistence:
+      # This should go back to 3 when I have more cluster
+      defaultClassReplicaCount: 2
+    defaultSettings:
+      # This should go back to null when I have more cluster
+      replicaSoftAntiAffinity: true
 ---
 apiVersion: v1
 kind: ConfigMap