chore: Update manifests after change

clusters/cl01tl/manifests/freshrss/Cluster-freshrss-postgresql-18-cluster.yaml

@@ -4,11 +4,11 @@ metadata:
   name: freshrss-postgresql-18-cluster
   namespace: freshrss
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: freshrss-postgresql-18
     app.kubernetes.io/instance: freshrss
     app.kubernetes.io/part-of: freshrss
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   instances: 3
@@ -16,26 +16,6 @@ spec:
   imagePullPolicy: IfNotPresent
   postgresUID: 26
   postgresGID: 26
-  plugins:
-    - name: barman-cloud.cloudnative-pg.io
-      enabled: true
-      isWALArchiver: false
-      parameters:
-        barmanObjectName: "freshrss-postgresql-18-external-backup"
-        serverName: "freshrss-postgresql-18-backup-1"
-    - name: barman-cloud.cloudnative-pg.io
-      enabled: true
-      isWALArchiver: true
-      parameters:
-        barmanObjectName: "freshrss-postgresql-18-garage-local-backup"
-        serverName: "freshrss-postgresql-18-backup-1"
-  externalClusters:
-    - name: recovery
-      plugin:
-        name: barman-cloud.cloudnative-pg.io
-        parameters:
-          barmanObjectName: "freshrss-postgresql-18-recovery"
-          serverName: freshrss-postgresql-18-backup-1
   storage:
     size: 10Gi
     storageClass: local-path
@@ -64,6 +44,13 @@ spec:
   monitoring:
     enablePodMonitor: true
     disableDefaultQueries: false
+  plugins:
+    - name: barman-cloud.cloudnative-pg.io
+      enabled: true
+      isWALArchiver: true
+      parameters:
+        barmanObjectName: "freshrss-postgresql-18-garage-local-backup"
+        serverName: "freshrss-postgresql-18-backup-1"
   bootstrap:
     recovery:
       database: app

clusters/cl01tl/manifests/freshrss/ObjectStore-freshrss-postgresql-18-external-backup.yaml

@@ -1,24 +0,0 @@
-apiVersion: barmancloud.cnpg.io/v1
-kind: ObjectStore
-metadata:
-  name: "freshrss-postgresql-18-external-backup"
-  namespace: freshrss
-  labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
-    app.kubernetes.io/name: freshrss-postgresql-18
-    app.kubernetes.io/instance: freshrss
-    app.kubernetes.io/part-of: freshrss
-    app.kubernetes.io/version: "6.16.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  retentionPolicy: 30d
-  configuration:
-    destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/freshrss/freshrss-postgresql-18-cluster
-    endpointURL: https://nyc3.digitaloceanspaces.com
-    s3Credentials:
-      accessKeyId:
-        name: freshrss-postgresql-18-cluster-backup-secret
-        key: ACCESS_KEY_ID
-      secretAccessKey:
-        name: freshrss-postgresql-18-cluster-backup-secret
-        key: ACCESS_SECRET_KEY

clusters/cl01tl/manifests/freshrss/ObjectStore-freshrss-postgresql-18-garage-local-backup.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "freshrss-postgresql-18-garage-local-backup"
   namespace: freshrss
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: freshrss-postgresql-18
     app.kubernetes.io/instance: freshrss
     app.kubernetes.io/part-of: freshrss
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   retentionPolicy: 3d

clusters/cl01tl/manifests/freshrss/ObjectStore-freshrss-postgresql-18-recovery.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "freshrss-postgresql-18-recovery"
   namespace: freshrss
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: freshrss-postgresql-18
     app.kubernetes.io/instance: freshrss
     app.kubernetes.io/part-of: freshrss
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   configuration:

clusters/cl01tl/manifests/freshrss/PrometheusRule-freshrss-postgresql-18-alert-rules.yaml

@@ -4,11 +4,11 @@ metadata:
   name: freshrss-postgresql-18-alert-rules
   namespace: freshrss
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: freshrss-postgresql-18
     app.kubernetes.io/instance: freshrss
     app.kubernetes.io/part-of: freshrss
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   groups:

clusters/cl01tl/manifests/freshrss/ScheduledBackup-freshrss-postgresql-18-daily-backup-scheduled-backup.yaml

@@ -1,24 +0,0 @@
-apiVersion: postgresql.cnpg.io/v1
-kind: ScheduledBackup
-metadata:
-  name: "freshrss-postgresql-18-daily-backup-scheduled-backup"
-  namespace: freshrss
-  labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
-    app.kubernetes.io/name: freshrss-postgresql-18
-    app.kubernetes.io/instance: freshrss
-    app.kubernetes.io/part-of: freshrss
-    app.kubernetes.io/version: "6.16.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  immediate: true
-  suspend: false
-  schedule: "0 0 0 * * *"
-  backupOwnerReference: self
-  cluster:
-    name: freshrss-postgresql-18-cluster
-  method: plugin
-  pluginConfiguration:
-    name: barman-cloud.cloudnative-pg.io
-    parameters:
-      barmanObjectName: "freshrss-postgresql-18-external-backup"

clusters/cl01tl/manifests/freshrss/ScheduledBackup-freshrss-postgresql-18-live-backup-scheduled-backup.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "freshrss-postgresql-18-live-backup-scheduled-backup"
   namespace: freshrss
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: freshrss-postgresql-18
     app.kubernetes.io/instance: freshrss
     app.kubernetes.io/part-of: freshrss
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   immediate: true

clusters/cl01tl/manifests/gatus/Cluster-gatus-postgresql-18-cluster.yaml

@@ -4,11 +4,11 @@ metadata:
   name: gatus-postgresql-18-cluster
   namespace: gatus
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: gatus-postgresql-18
     app.kubernetes.io/instance: gatus
     app.kubernetes.io/part-of: gatus
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   instances: 3
@@ -16,26 +16,6 @@ spec:
   imagePullPolicy: IfNotPresent
   postgresUID: 26
   postgresGID: 26
-  plugins:
-    - name: barman-cloud.cloudnative-pg.io
-      enabled: true
-      isWALArchiver: false
-      parameters:
-        barmanObjectName: "gatus-postgresql-18-external-backup"
-        serverName: "gatus-postgresql-18-backup-2"
-    - name: barman-cloud.cloudnative-pg.io
-      enabled: true
-      isWALArchiver: true
-      parameters:
-        barmanObjectName: "gatus-postgresql-18-garage-local-backup"
-        serverName: "gatus-postgresql-18-backup-1"
-  externalClusters:
-    - name: recovery
-      plugin:
-        name: barman-cloud.cloudnative-pg.io
-        parameters:
-          barmanObjectName: "gatus-postgresql-18-recovery"
-          serverName: gatus-postgresql-18-backup-1
   storage:
     size: 10Gi
     storageClass: local-path
@@ -64,6 +44,13 @@ spec:
   monitoring:
     enablePodMonitor: true
     disableDefaultQueries: false
+  plugins:
+    - name: barman-cloud.cloudnative-pg.io
+      enabled: true
+      isWALArchiver: true
+      parameters:
+        barmanObjectName: "gatus-postgresql-18-garage-local-backup"
+        serverName: "gatus-postgresql-18-backup-1"
   bootstrap:
     recovery:
       database: app

clusters/cl01tl/manifests/gatus/ObjectStore-gatus-postgresql-18-external-backup.yaml

@@ -1,24 +0,0 @@
-apiVersion: barmancloud.cnpg.io/v1
-kind: ObjectStore
-metadata:
-  name: "gatus-postgresql-18-external-backup"
-  namespace: gatus
-  labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
-    app.kubernetes.io/name: gatus-postgresql-18
-    app.kubernetes.io/instance: gatus
-    app.kubernetes.io/part-of: gatus
-    app.kubernetes.io/version: "6.16.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  retentionPolicy: 30d
-  configuration:
-    destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/gatus/gatus-postgresql-18-cluster
-    endpointURL: https://nyc3.digitaloceanspaces.com
-    s3Credentials:
-      accessKeyId:
-        name: gatus-postgresql-18-cluster-backup-secret
-        key: ACCESS_KEY_ID
-      secretAccessKey:
-        name: gatus-postgresql-18-cluster-backup-secret
-        key: ACCESS_SECRET_KEY

clusters/cl01tl/manifests/gatus/ObjectStore-gatus-postgresql-18-garage-local-backup.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "gatus-postgresql-18-garage-local-backup"
   namespace: gatus
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: gatus-postgresql-18
     app.kubernetes.io/instance: gatus
     app.kubernetes.io/part-of: gatus
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   retentionPolicy: 3d
@@ -17,11 +17,11 @@ spec:
     endpointURL: http://garage-main.garage:3900
     s3Credentials:
       accessKeyId:
-        name: gatus-postgresql-17-cluster-backup-secret-garage
+        name: gatus-postgresql-18-cluster-backup-secret-garage
         key: ACCESS_KEY_ID
       secretAccessKey:
-        name: gatus-postgresql-17-cluster-backup-secret-garage
+        name: gatus-postgresql-18-cluster-backup-secret-garage
         key: ACCESS_SECRET_KEY
       region:
-        name: gatus-postgresql-17-cluster-backup-secret-garage
+        name: gatus-postgresql-18-cluster-backup-secret-garage
         key: ACCESS_REGION

clusters/cl01tl/manifests/gatus/ObjectStore-gatus-postgresql-18-recovery.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "gatus-postgresql-18-recovery"
   namespace: gatus
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: gatus-postgresql-18
     app.kubernetes.io/instance: gatus
     app.kubernetes.io/part-of: gatus
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   configuration:

clusters/cl01tl/manifests/gatus/PrometheusRule-gatus-postgresql-18-alert-rules.yaml

@@ -4,11 +4,11 @@ metadata:
   name: gatus-postgresql-18-alert-rules
   namespace: gatus
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: gatus-postgresql-18
     app.kubernetes.io/instance: gatus
     app.kubernetes.io/part-of: gatus
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   groups:

clusters/cl01tl/manifests/gatus/ScheduledBackup-gatus-postgresql-18-daily-backup-scheduled-backup.yaml

@@ -1,24 +0,0 @@
-apiVersion: postgresql.cnpg.io/v1
-kind: ScheduledBackup
-metadata:
-  name: "gatus-postgresql-18-daily-backup-scheduled-backup"
-  namespace: gatus
-  labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
-    app.kubernetes.io/name: gatus-postgresql-18
-    app.kubernetes.io/instance: gatus
-    app.kubernetes.io/part-of: gatus
-    app.kubernetes.io/version: "6.16.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  immediate: true
-  suspend: false
-  schedule: "0 0 0 * * *"
-  backupOwnerReference: self
-  cluster:
-    name: gatus-postgresql-18-cluster
-  method: plugin
-  pluginConfiguration:
-    name: barman-cloud.cloudnative-pg.io
-    parameters:
-      barmanObjectName: "gatus-postgresql-18-external-backup"

clusters/cl01tl/manifests/gatus/ScheduledBackup-gatus-postgresql-18-live-backup-scheduled-backup.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "gatus-postgresql-18-live-backup-scheduled-backup"
   namespace: gatus
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: gatus-postgresql-18
     app.kubernetes.io/instance: gatus
     app.kubernetes.io/part-of: gatus
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   immediate: true

clusters/cl01tl/manifests/gitea/Cluster-gitea-postgresql-18-cluster.yaml

@@ -4,11 +4,11 @@ metadata:
   name: gitea-postgresql-18-cluster
   namespace: gitea
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: gitea-postgresql-18
     app.kubernetes.io/instance: gitea
     app.kubernetes.io/part-of: gitea
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   instances: 3
@@ -16,26 +16,6 @@ spec:
   imagePullPolicy: IfNotPresent
   postgresUID: 26
   postgresGID: 26
-  plugins:
-    - name: barman-cloud.cloudnative-pg.io
-      enabled: true
-      isWALArchiver: false
-      parameters:
-        barmanObjectName: "gitea-postgresql-18-external-backup"
-        serverName: "gitea-postgresql-18-backup-1"
-    - name: barman-cloud.cloudnative-pg.io
-      enabled: true
-      isWALArchiver: true
-      parameters:
-        barmanObjectName: "gitea-postgresql-18-garage-local-backup"
-        serverName: "gitea-postgresql-18-backup-1"
-  externalClusters:
-    - name: recovery
-      plugin:
-        name: barman-cloud.cloudnative-pg.io
-        parameters:
-          barmanObjectName: "gitea-postgresql-18-recovery"
-          serverName: gitea-postgresql-18-backup-1
   storage:
     size: 10Gi
     storageClass: local-path
@@ -64,6 +44,13 @@ spec:
   monitoring:
     enablePodMonitor: true
     disableDefaultQueries: false
+  plugins:
+    - name: barman-cloud.cloudnative-pg.io
+      enabled: true
+      isWALArchiver: true
+      parameters:
+        barmanObjectName: "gitea-postgresql-18-garage-local-backup"
+        serverName: "gitea-postgresql-18-backup-1"
   bootstrap:
     recovery:
       database: app

clusters/cl01tl/manifests/gitea/ObjectStore-gitea-postgresql-18-external-backup.yaml

@@ -1,24 +0,0 @@
-apiVersion: barmancloud.cnpg.io/v1
-kind: ObjectStore
-metadata:
-  name: "gitea-postgresql-18-external-backup"
-  namespace: gitea
-  labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
-    app.kubernetes.io/name: gitea-postgresql-18
-    app.kubernetes.io/instance: gitea
-    app.kubernetes.io/part-of: gitea
-    app.kubernetes.io/version: "6.16.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  retentionPolicy: 30d
-  configuration:
-    destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/gitea/gitea-postgresql-18-cluster
-    endpointURL: https://nyc3.digitaloceanspaces.com
-    s3Credentials:
-      accessKeyId:
-        name: gitea-postgresql-18-cluster-backup-secret
-        key: ACCESS_KEY_ID
-      secretAccessKey:
-        name: gitea-postgresql-18-cluster-backup-secret
-        key: ACCESS_SECRET_KEY

clusters/cl01tl/manifests/gitea/ObjectStore-gitea-postgresql-18-garage-local-backup.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "gitea-postgresql-18-garage-local-backup"
   namespace: gitea
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: gitea-postgresql-18
     app.kubernetes.io/instance: gitea
     app.kubernetes.io/part-of: gitea
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   retentionPolicy: 3d

clusters/cl01tl/manifests/gitea/ObjectStore-gitea-postgresql-18-recovery.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "gitea-postgresql-18-recovery"
   namespace: gitea
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: gitea-postgresql-18
     app.kubernetes.io/instance: gitea
     app.kubernetes.io/part-of: gitea
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   configuration:

clusters/cl01tl/manifests/gitea/PrometheusRule-gitea-postgresql-18-alert-rules.yaml

@@ -4,11 +4,11 @@ metadata:
   name: gitea-postgresql-18-alert-rules
   namespace: gitea
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: gitea-postgresql-18
     app.kubernetes.io/instance: gitea
     app.kubernetes.io/part-of: gitea
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   groups:

clusters/cl01tl/manifests/gitea/ScheduledBackup-gitea-postgresql-18-daily-backup-scheduled-backup.yaml

@@ -1,24 +0,0 @@
-apiVersion: postgresql.cnpg.io/v1
-kind: ScheduledBackup
-metadata:
-  name: "gitea-postgresql-18-daily-backup-scheduled-backup"
-  namespace: gitea
-  labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
-    app.kubernetes.io/name: gitea-postgresql-18
-    app.kubernetes.io/instance: gitea
-    app.kubernetes.io/part-of: gitea
-    app.kubernetes.io/version: "6.16.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  immediate: true
-  suspend: false
-  schedule: "0 0 0 * * *"
-  backupOwnerReference: self
-  cluster:
-    name: gitea-postgresql-18-cluster
-  method: plugin
-  pluginConfiguration:
-    name: barman-cloud.cloudnative-pg.io
-    parameters:
-      barmanObjectName: "gitea-postgresql-18-external-backup"

clusters/cl01tl/manifests/gitea/ScheduledBackup-gitea-postgresql-18-live-backup-scheduled-backup.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "gitea-postgresql-18-live-backup-scheduled-backup"
   namespace: gitea
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: gitea-postgresql-18
     app.kubernetes.io/instance: gitea
     app.kubernetes.io/part-of: gitea
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   immediate: true

clusters/cl01tl/manifests/grafana-operator/Cluster-grafana-operator-postgresql-18-cluster.yaml

@@ -4,11 +4,11 @@ metadata:
   name: grafana-operator-postgresql-18-cluster
   namespace: grafana-operator
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: grafana-operator-postgresql-18
     app.kubernetes.io/instance: grafana-operator
     app.kubernetes.io/part-of: grafana-operator
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   instances: 3
@@ -16,26 +16,6 @@ spec:
   imagePullPolicy: IfNotPresent
   postgresUID: 26
   postgresGID: 26
-  plugins:
-    - name: barman-cloud.cloudnative-pg.io
-      enabled: true
-      isWALArchiver: false
-      parameters:
-        barmanObjectName: "grafana-operator-postgresql-18-external-backup"
-        serverName: "grafana-operator-postgresql-18-backup-1"
-    - name: barman-cloud.cloudnative-pg.io
-      enabled: true
-      isWALArchiver: true
-      parameters:
-        barmanObjectName: "grafana-operator-postgresql-18-garage-local-backup"
-        serverName: "grafana-operator-postgresql-18-backup-1"
-  externalClusters:
-    - name: recovery
-      plugin:
-        name: barman-cloud.cloudnative-pg.io
-        parameters:
-          barmanObjectName: "grafana-operator-postgresql-18-recovery"
-          serverName: grafana-operator-postgresql-18-backup-1
   storage:
     size: 10Gi
     storageClass: local-path
@@ -64,6 +44,13 @@ spec:
   monitoring:
     enablePodMonitor: true
     disableDefaultQueries: false
+  plugins:
+    - name: barman-cloud.cloudnative-pg.io
+      enabled: true
+      isWALArchiver: true
+      parameters:
+        barmanObjectName: "grafana-operator-postgresql-18-garage-local-backup"
+        serverName: "grafana-operator-postgresql-18-backup-1"
   bootstrap:
     recovery:
       database: app

clusters/cl01tl/manifests/grafana-operator/ObjectStore-grafana-operator-postgresql-18-external-backup.yaml

@@ -1,24 +0,0 @@
-apiVersion: barmancloud.cnpg.io/v1
-kind: ObjectStore
-metadata:
-  name: "grafana-operator-postgresql-18-external-backup"
-  namespace: grafana-operator
-  labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
-    app.kubernetes.io/name: grafana-operator-postgresql-18
-    app.kubernetes.io/instance: grafana-operator
-    app.kubernetes.io/part-of: grafana-operator
-    app.kubernetes.io/version: "6.16.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  retentionPolicy: 30d
-  configuration:
-    destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/grafana-operator/grafana-operator-postgresql-18-cluster
-    endpointURL: https://nyc3.digitaloceanspaces.com
-    s3Credentials:
-      accessKeyId:
-        name: grafana-operator-postgresql-18-cluster-backup-secret
-        key: ACCESS_KEY_ID
-      secretAccessKey:
-        name: grafana-operator-postgresql-18-cluster-backup-secret
-        key: ACCESS_SECRET_KEY

clusters/cl01tl/manifests/grafana-operator/ObjectStore-grafana-operator-postgresql-18-garage-local-backup.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "grafana-operator-postgresql-18-garage-local-backup"
   namespace: grafana-operator
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: grafana-operator-postgresql-18
     app.kubernetes.io/instance: grafana-operator
     app.kubernetes.io/part-of: grafana-operator
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   retentionPolicy: 3d

clusters/cl01tl/manifests/grafana-operator/ObjectStore-grafana-operator-postgresql-18-recovery.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "grafana-operator-postgresql-18-recovery"
   namespace: grafana-operator
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: grafana-operator-postgresql-18
     app.kubernetes.io/instance: grafana-operator
     app.kubernetes.io/part-of: grafana-operator
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   configuration:

clusters/cl01tl/manifests/grafana-operator/PrometheusRule-grafana-operator-postgresql-18-alert-rules.yaml

@@ -4,11 +4,11 @@ metadata:
   name: grafana-operator-postgresql-18-alert-rules
   namespace: grafana-operator
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: grafana-operator-postgresql-18
     app.kubernetes.io/instance: grafana-operator
     app.kubernetes.io/part-of: grafana-operator
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   groups:

clusters/cl01tl/manifests/grafana-operator/ScheduledBackup-grafana-operator-postgresql-18-daily-backup-scheduled-backup.yaml

@@ -1,24 +0,0 @@
-apiVersion: postgresql.cnpg.io/v1
-kind: ScheduledBackup
-metadata:
-  name: "grafana-operator-postgresql-18-daily-backup-scheduled-backup"
-  namespace: grafana-operator
-  labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
-    app.kubernetes.io/name: grafana-operator-postgresql-18
-    app.kubernetes.io/instance: grafana-operator
-    app.kubernetes.io/part-of: grafana-operator
-    app.kubernetes.io/version: "6.16.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  immediate: true
-  suspend: false
-  schedule: "0 0 0 * * *"
-  backupOwnerReference: self
-  cluster:
-    name: grafana-operator-postgresql-18-cluster
-  method: plugin
-  pluginConfiguration:
-    name: barman-cloud.cloudnative-pg.io
-    parameters:
-      barmanObjectName: "grafana-operator-postgresql-18-external-backup"

clusters/cl01tl/manifests/grafana-operator/ScheduledBackup-grafana-operator-postgresql-18-live-backup-scheduled-backup.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "grafana-operator-postgresql-18-live-backup-scheduled-backup"
   namespace: grafana-operator
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: grafana-operator-postgresql-18
     app.kubernetes.io/instance: grafana-operator
     app.kubernetes.io/part-of: grafana-operator
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   immediate: true

clusters/cl01tl/manifests/harbor/Cluster-harbor-postgresql-18-cluster.yaml

@@ -4,11 +4,11 @@ metadata:
   name: harbor-postgresql-18-cluster
   namespace: harbor
   labels:
-    helm.sh/chart: postgres-18-cluster-6.17.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: harbor-postgresql-18
     app.kubernetes.io/instance: harbor
     app.kubernetes.io/part-of: harbor
-    app.kubernetes.io/version: "6.17.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   instances: 3
@@ -16,26 +16,6 @@ spec:
   imagePullPolicy: IfNotPresent
   postgresUID: 26
   postgresGID: 26
-  plugins:
-    - name: barman-cloud.cloudnative-pg.io
-      enabled: true
-      isWALArchiver: false
-      parameters:
-        barmanObjectName: "harbor-postgresql-18-external-backup"
-        serverName: "harbor-postgresql-18-backup-1"
-    - name: barman-cloud.cloudnative-pg.io
-      enabled: true
-      isWALArchiver: true
-      parameters:
-        barmanObjectName: "harbor-postgresql-18-garage-local-backup"
-        serverName: "harbor-postgresql-18-backup-1"
-  externalClusters:
-    - name: recovery
-      plugin:
-        name: barman-cloud.cloudnative-pg.io
-        parameters:
-          barmanObjectName: "harbor-postgresql-18-recovery"
-          serverName: harbor-postgresql-18-backup-1
   storage:
     size: 10Gi
     storageClass: local-path
@@ -64,6 +44,13 @@ spec:
   monitoring:
     enablePodMonitor: true
     disableDefaultQueries: false
+  plugins:
+    - name: barman-cloud.cloudnative-pg.io
+      enabled: true
+      isWALArchiver: true
+      parameters:
+        barmanObjectName: "harbor-postgresql-18-garage-local-backup"
+        serverName: "harbor-postgresql-18-backup-1"
   bootstrap:
     recovery:
       database: app

clusters/cl01tl/manifests/harbor/ObjectStore-harbor-postgresql-18-external-backup.yaml

@@ -1,24 +0,0 @@
-apiVersion: barmancloud.cnpg.io/v1
-kind: ObjectStore
-metadata:
-  name: "harbor-postgresql-18-external-backup"
-  namespace: harbor
-  labels:
-    helm.sh/chart: postgres-18-cluster-6.17.1
-    app.kubernetes.io/name: harbor-postgresql-18
-    app.kubernetes.io/instance: harbor
-    app.kubernetes.io/part-of: harbor
-    app.kubernetes.io/version: "6.17.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  retentionPolicy: 30d
-  configuration:
-    destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/harbor/harbor-postgresql-18-cluster
-    endpointURL: https://nyc3.digitaloceanspaces.com
-    s3Credentials:
-      accessKeyId:
-        name: harbor-postgresql-18-cluster-backup-secret
-        key: ACCESS_KEY_ID
-      secretAccessKey:
-        name: harbor-postgresql-18-cluster-backup-secret
-        key: ACCESS_SECRET_KEY

clusters/cl01tl/manifests/harbor/ObjectStore-harbor-postgresql-18-garage-local-backup.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "harbor-postgresql-18-garage-local-backup"
   namespace: harbor
   labels:
-    helm.sh/chart: postgres-18-cluster-6.17.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: harbor-postgresql-18
     app.kubernetes.io/instance: harbor
     app.kubernetes.io/part-of: harbor
-    app.kubernetes.io/version: "6.17.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   retentionPolicy: 3d

clusters/cl01tl/manifests/harbor/ObjectStore-harbor-postgresql-18-recovery.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "harbor-postgresql-18-recovery"
   namespace: harbor
   labels:
-    helm.sh/chart: postgres-18-cluster-6.17.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: harbor-postgresql-18
     app.kubernetes.io/instance: harbor
     app.kubernetes.io/part-of: harbor
-    app.kubernetes.io/version: "6.17.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   configuration:

clusters/cl01tl/manifests/harbor/PrometheusRule-harbor-postgresql-18-alert-rules.yaml

@@ -4,11 +4,11 @@ metadata:
   name: harbor-postgresql-18-alert-rules
   namespace: harbor
   labels:
-    helm.sh/chart: postgres-18-cluster-6.17.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: harbor-postgresql-18
     app.kubernetes.io/instance: harbor
     app.kubernetes.io/part-of: harbor
-    app.kubernetes.io/version: "6.17.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   groups:

clusters/cl01tl/manifests/harbor/ScheduledBackup-harbor-postgresql-18-daily-backup-scheduled-backup.yaml

@@ -1,24 +0,0 @@
-apiVersion: postgresql.cnpg.io/v1
-kind: ScheduledBackup
-metadata:
-  name: "harbor-postgresql-18-daily-backup-scheduled-backup"
-  namespace: harbor
-  labels:
-    helm.sh/chart: postgres-18-cluster-6.17.1
-    app.kubernetes.io/name: harbor-postgresql-18
-    app.kubernetes.io/instance: harbor
-    app.kubernetes.io/part-of: harbor
-    app.kubernetes.io/version: "6.17.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  immediate: true
-  suspend: false
-  schedule: "0 0 0 * * *"
-  backupOwnerReference: self
-  cluster:
-    name: harbor-postgresql-18-cluster
-  method: plugin
-  pluginConfiguration:
-    name: barman-cloud.cloudnative-pg.io
-    parameters:
-      barmanObjectName: "harbor-postgresql-18-external-backup"

clusters/cl01tl/manifests/harbor/ScheduledBackup-harbor-postgresql-18-live-backup-scheduled-backup.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "harbor-postgresql-18-live-backup-scheduled-backup"
   namespace: harbor
   labels:
-    helm.sh/chart: postgres-18-cluster-6.17.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: harbor-postgresql-18
     app.kubernetes.io/instance: harbor
     app.kubernetes.io/part-of: harbor
-    app.kubernetes.io/version: "6.17.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   immediate: true

clusters/cl01tl/manifests/immich/Cluster-immich-postgresql-18-cluster.yaml

@@ -4,11 +4,11 @@ metadata:
   name: immich-postgresql-18-cluster
   namespace: immich
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: immich-postgresql-18
     app.kubernetes.io/instance: immich
     app.kubernetes.io/part-of: immich
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   instances: 3
@@ -16,26 +16,6 @@ spec:
   imagePullPolicy: IfNotPresent
   postgresUID: 26
   postgresGID: 26
-  plugins:
-    - name: barman-cloud.cloudnative-pg.io
-      enabled: true
-      isWALArchiver: false
-      parameters:
-        barmanObjectName: "immich-postgresql-18-external-backup"
-        serverName: "immich-postgresql-18-backup-1"
-    - name: barman-cloud.cloudnative-pg.io
-      enabled: true
-      isWALArchiver: true
-      parameters:
-        barmanObjectName: "immich-postgresql-18-garage-local-backup"
-        serverName: "immich-postgresql-18-backup-1"
-  externalClusters:
-    - name: recovery
-      plugin:
-        name: barman-cloud.cloudnative-pg.io
-        parameters:
-          barmanObjectName: "immich-postgresql-18-recovery"
-          serverName: immich-postgresql-18-backup-1
   storage:
     size: 10Gi
     storageClass: local-path
@@ -66,6 +46,13 @@ spec:
   monitoring:
     enablePodMonitor: true
     disableDefaultQueries: false
+  plugins:
+    - name: barman-cloud.cloudnative-pg.io
+      enabled: true
+      isWALArchiver: true
+      parameters:
+        barmanObjectName: "immich-postgresql-18-garage-local-backup"
+        serverName: "immich-postgresql-18-backup-1"
   bootstrap:
     recovery:
       database: app

clusters/cl01tl/manifests/immich/ObjectStore-immich-postgresql-18-external-backup.yaml

@@ -1,24 +0,0 @@
-apiVersion: barmancloud.cnpg.io/v1
-kind: ObjectStore
-metadata:
-  name: "immich-postgresql-18-external-backup"
-  namespace: immich
-  labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
-    app.kubernetes.io/name: immich-postgresql-18
-    app.kubernetes.io/instance: immich
-    app.kubernetes.io/part-of: immich
-    app.kubernetes.io/version: "6.16.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  retentionPolicy: 30d
-  configuration:
-    destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/immich/immich-postgresql-18-cluster
-    endpointURL: https://nyc3.digitaloceanspaces.com
-    s3Credentials:
-      accessKeyId:
-        name: immich-postgresql-18-cluster-backup-secret
-        key: ACCESS_KEY_ID
-      secretAccessKey:
-        name: immich-postgresql-18-cluster-backup-secret
-        key: ACCESS_SECRET_KEY

clusters/cl01tl/manifests/immich/ObjectStore-immich-postgresql-18-garage-local-backup.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "immich-postgresql-18-garage-local-backup"
   namespace: immich
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: immich-postgresql-18
     app.kubernetes.io/instance: immich
     app.kubernetes.io/part-of: immich
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   retentionPolicy: 3d

clusters/cl01tl/manifests/immich/ObjectStore-immich-postgresql-18-recovery.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "immich-postgresql-18-recovery"
   namespace: immich
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: immich-postgresql-18
     app.kubernetes.io/instance: immich
     app.kubernetes.io/part-of: immich
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   configuration:

clusters/cl01tl/manifests/immich/PrometheusRule-immich-postgresql-18-alert-rules.yaml

@@ -4,11 +4,11 @@ metadata:
   name: immich-postgresql-18-alert-rules
   namespace: immich
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: immich-postgresql-18
     app.kubernetes.io/instance: immich
     app.kubernetes.io/part-of: immich
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   groups:

clusters/cl01tl/manifests/immich/ScheduledBackup-immich-postgresql-18-daily-backup-scheduled-backup.yaml

@@ -1,24 +0,0 @@
-apiVersion: postgresql.cnpg.io/v1
-kind: ScheduledBackup
-metadata:
-  name: "immich-postgresql-18-daily-backup-scheduled-backup"
-  namespace: immich
-  labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
-    app.kubernetes.io/name: immich-postgresql-18
-    app.kubernetes.io/instance: immich
-    app.kubernetes.io/part-of: immich
-    app.kubernetes.io/version: "6.16.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  immediate: true
-  suspend: false
-  schedule: "0 0 0 * * *"
-  backupOwnerReference: self
-  cluster:
-    name: immich-postgresql-18-cluster
-  method: plugin
-  pluginConfiguration:
-    name: barman-cloud.cloudnative-pg.io
-    parameters:
-      barmanObjectName: "immich-postgresql-18-external-backup"

clusters/cl01tl/manifests/immich/ScheduledBackup-immich-postgresql-18-live-backup-scheduled-backup.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "immich-postgresql-18-live-backup-scheduled-backup"
   namespace: immich
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: immich-postgresql-18
     app.kubernetes.io/instance: immich
     app.kubernetes.io/part-of: immich
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   immediate: true

clusters/cl01tl/manifests/jellystat/Cluster-jellystat-postgresql-18-cluster.yaml

@@ -4,11 +4,11 @@ metadata:
   name: jellystat-postgresql-18-cluster
   namespace: jellystat
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: jellystat-postgresql-18
     app.kubernetes.io/instance: jellystat
     app.kubernetes.io/part-of: jellystat
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   instances: 3
@@ -16,26 +16,6 @@ spec:
   imagePullPolicy: IfNotPresent
   postgresUID: 26
   postgresGID: 26
-  plugins:
-    - name: barman-cloud.cloudnative-pg.io
-      enabled: true
-      isWALArchiver: false
-      parameters:
-        barmanObjectName: "jellystat-postgresql-18-external-backup"
-        serverName: "jellystat-postgresql-18-backup-1"
-    - name: barman-cloud.cloudnative-pg.io
-      enabled: true
-      isWALArchiver: true
-      parameters:
-        barmanObjectName: "jellystat-postgresql-18-garage-local-backup"
-        serverName: "jellystat-postgresql-18-backup-1"
-  externalClusters:
-    - name: recovery
-      plugin:
-        name: barman-cloud.cloudnative-pg.io
-        parameters:
-          barmanObjectName: "jellystat-postgresql-18-recovery"
-          serverName: jellystat-postgresql-18-backup-1
   storage:
     size: 10Gi
     storageClass: local-path
@@ -64,6 +44,13 @@ spec:
   monitoring:
     enablePodMonitor: true
     disableDefaultQueries: false
+  plugins:
+    - name: barman-cloud.cloudnative-pg.io
+      enabled: true
+      isWALArchiver: true
+      parameters:
+        barmanObjectName: "jellystat-postgresql-18-garage-local-backup"
+        serverName: "jellystat-postgresql-18-backup-1"
   bootstrap:
     recovery:
       database: app

clusters/cl01tl/manifests/jellystat/ObjectStore-jellystat-postgresql-18-external-backup.yaml

@@ -1,24 +0,0 @@
-apiVersion: barmancloud.cnpg.io/v1
-kind: ObjectStore
-metadata:
-  name: "jellystat-postgresql-18-external-backup"
-  namespace: jellystat
-  labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
-    app.kubernetes.io/name: jellystat-postgresql-18
-    app.kubernetes.io/instance: jellystat
-    app.kubernetes.io/part-of: jellystat
-    app.kubernetes.io/version: "6.16.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  retentionPolicy: 30d
-  configuration:
-    destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/jellystat/jellystat-postgresql-18-cluster
-    endpointURL: https://nyc3.digitaloceanspaces.com
-    s3Credentials:
-      accessKeyId:
-        name: jellystat-postgresql-18-cluster-backup-secret
-        key: ACCESS_KEY_ID
-      secretAccessKey:
-        name: jellystat-postgresql-18-cluster-backup-secret
-        key: ACCESS_SECRET_KEY

clusters/cl01tl/manifests/jellystat/ObjectStore-jellystat-postgresql-18-garage-local-backup.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "jellystat-postgresql-18-garage-local-backup"
   namespace: jellystat
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: jellystat-postgresql-18
     app.kubernetes.io/instance: jellystat
     app.kubernetes.io/part-of: jellystat
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   retentionPolicy: 3d

clusters/cl01tl/manifests/jellystat/ObjectStore-jellystat-postgresql-18-recovery.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "jellystat-postgresql-18-recovery"
   namespace: jellystat
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: jellystat-postgresql-18
     app.kubernetes.io/instance: jellystat
     app.kubernetes.io/part-of: jellystat
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   configuration:

clusters/cl01tl/manifests/jellystat/PrometheusRule-jellystat-postgresql-18-alert-rules.yaml

@@ -4,11 +4,11 @@ metadata:
   name: jellystat-postgresql-18-alert-rules
   namespace: jellystat
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: jellystat-postgresql-18
     app.kubernetes.io/instance: jellystat
     app.kubernetes.io/part-of: jellystat
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   groups:

clusters/cl01tl/manifests/jellystat/ScheduledBackup-jellystat-postgresql-18-daily-backup-scheduled-backup.yaml

@@ -1,24 +0,0 @@
-apiVersion: postgresql.cnpg.io/v1
-kind: ScheduledBackup
-metadata:
-  name: "jellystat-postgresql-18-daily-backup-scheduled-backup"
-  namespace: jellystat
-  labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
-    app.kubernetes.io/name: jellystat-postgresql-18
-    app.kubernetes.io/instance: jellystat
-    app.kubernetes.io/part-of: jellystat
-    app.kubernetes.io/version: "6.16.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  immediate: true
-  suspend: false
-  schedule: "0 0 0 * * *"
-  backupOwnerReference: self
-  cluster:
-    name: jellystat-postgresql-18-cluster
-  method: plugin
-  pluginConfiguration:
-    name: barman-cloud.cloudnative-pg.io
-    parameters:
-      barmanObjectName: "jellystat-postgresql-18-external-backup"

clusters/cl01tl/manifests/jellystat/ScheduledBackup-jellystat-postgresql-18-live-backup-scheduled-backup.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "jellystat-postgresql-18-live-backup-scheduled-backup"
   namespace: jellystat
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: jellystat-postgresql-18
     app.kubernetes.io/instance: jellystat
     app.kubernetes.io/part-of: jellystat
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   immediate: true

clusters/cl01tl/manifests/komodo/Cluster-komodo-postgresql-17-fdb-cluster.yaml

@@ -4,11 +4,11 @@ metadata:
   name: komodo-postgresql-17-fdb-cluster
   namespace: komodo
   labels:
-    helm.sh/chart: postgresql-17-fdb-cluster-6.16.1
+    helm.sh/chart: postgresql-17-fdb-cluster-7.1.1
     app.kubernetes.io/name: komodo-postgresql-17-fdb
     app.kubernetes.io/instance: komodo
     app.kubernetes.io/part-of: komodo
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   instances: 3
@@ -16,26 +16,6 @@ spec:
   imagePullPolicy: IfNotPresent
   postgresUID: 999
   postgresGID: 999
-  plugins:
-    - name: barman-cloud.cloudnative-pg.io
-      enabled: true
-      isWALArchiver: false
-      parameters:
-        barmanObjectName: "komodo-postgresql-17-fdb-external-backup"
-        serverName: "komodo-postgresql-17-fdb-backup-2"
-    - name: barman-cloud.cloudnative-pg.io
-      enabled: true
-      isWALArchiver: true
-      parameters:
-        barmanObjectName: "komodo-postgresql-17-fdb-garage-local-backup"
-        serverName: "komodo-postgresql-17-fdb-backup-1"
-  externalClusters:
-    - name: recovery
-      plugin:
-        name: barman-cloud.cloudnative-pg.io
-        parameters:
-          barmanObjectName: "komodo-postgresql-17-fdb-recovery"
-          serverName: komodo-postgresql-17-fdb-backup-1
   storage:
     size: 10Gi
     storageClass: local-path
@@ -54,7 +34,7 @@ spec:
   primaryUpdateMethod: switchover
   primaryUpdateStrategy: unsupervised
   logLevel: info
-  enableSuperuserAccess: true
+  enableSuperuserAccess: false
   enablePDB: true
   postgresql:
     shared_preload_libraries:
@@ -80,11 +60,23 @@ spec:
   monitoring:
     enablePodMonitor: true
     disableDefaultQueries: false
+  plugins:
+    - name: barman-cloud.cloudnative-pg.io
+      enabled: true
+      isWALArchiver: true
+      parameters:
+        barmanObjectName: "komodo-postgresql-17-fdb-garage-local-backup"
+        serverName: "komodo-postgresql-17-fdb-backup-1"
   bootstrap:
-    initdb:
+    recovery:
-      database: ferretDB
+      database: app
-      owner: ferret
+      source: komodo-postgresql-17-fdb-backup-1
-      postInitApplicationSQL:
+  externalClusters:
-        - create extension if not exists pg_cron;
+    - name: komodo-postgresql-17-fdb-backup-1
-        - create extension if not exists documentdb cascade;
+      plugin:
-        - grant documentdb_admin_role to ferret;
+        name: barman-cloud.cloudnative-pg.io
+        enabled: true
+        isWALArchiver: false
+        parameters:
+          barmanObjectName: "komodo-postgresql-17-fdb-recovery"
+          serverName: komodo-postgresql-17-fdb-backup-1

clusters/cl01tl/manifests/komodo/ObjectStore-komodo-postgresql-17-fdb-external-backup.yaml

@@ -1,24 +0,0 @@
-apiVersion: barmancloud.cnpg.io/v1
-kind: ObjectStore
-metadata:
-  name: "komodo-postgresql-17-fdb-external-backup"
-  namespace: komodo
-  labels:
-    helm.sh/chart: postgresql-17-fdb-cluster-6.16.1
-    app.kubernetes.io/name: komodo-postgresql-17-fdb
-    app.kubernetes.io/instance: komodo
-    app.kubernetes.io/part-of: komodo
-    app.kubernetes.io/version: "6.16.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  retentionPolicy: 30d
-  configuration:
-    destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/komodo/komodo-postgresql-17-fdb-cluster
-    endpointURL: https://nyc3.digitaloceanspaces.com
-    s3Credentials:
-      accessKeyId:
-        name: komodo-postgresql-17-fdb-cluster-backup-secret
-        key: ACCESS_KEY_ID
-      secretAccessKey:
-        name: komodo-postgresql-17-fdb-cluster-backup-secret
-        key: ACCESS_SECRET_KEY

clusters/cl01tl/manifests/komodo/ObjectStore-komodo-postgresql-17-fdb-garage-local-backup.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "komodo-postgresql-17-fdb-garage-local-backup"
   namespace: komodo
   labels:
-    helm.sh/chart: postgresql-17-fdb-cluster-6.16.1
+    helm.sh/chart: postgresql-17-fdb-cluster-7.1.1
     app.kubernetes.io/name: komodo-postgresql-17-fdb
     app.kubernetes.io/instance: komodo
     app.kubernetes.io/part-of: komodo
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   retentionPolicy: 3d

clusters/cl01tl/manifests/komodo/ObjectStore-komodo-postgresql-17-fdb-recovery.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "komodo-postgresql-17-fdb-recovery"
   namespace: komodo
   labels:
-    helm.sh/chart: postgresql-17-fdb-cluster-6.16.1
+    helm.sh/chart: postgresql-17-fdb-cluster-7.1.1
     app.kubernetes.io/name: komodo-postgresql-17-fdb
     app.kubernetes.io/instance: komodo
     app.kubernetes.io/part-of: komodo
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   configuration:

clusters/cl01tl/manifests/komodo/PrometheusRule-komodo-postgresql-17-fdb-alert-rules.yaml

@@ -4,11 +4,11 @@ metadata:
   name: komodo-postgresql-17-fdb-alert-rules
   namespace: komodo
   labels:
-    helm.sh/chart: postgresql-17-fdb-cluster-6.16.1
+    helm.sh/chart: postgresql-17-fdb-cluster-7.1.1
     app.kubernetes.io/name: komodo-postgresql-17-fdb
     app.kubernetes.io/instance: komodo
     app.kubernetes.io/part-of: komodo
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   groups:

clusters/cl01tl/manifests/komodo/ScheduledBackup-komodo-postgresql-17-fdb-daily-backup-scheduled-backup.yaml

@@ -1,24 +0,0 @@
-apiVersion: postgresql.cnpg.io/v1
-kind: ScheduledBackup
-metadata:
-  name: "komodo-postgresql-17-fdb-daily-backup-scheduled-backup"
-  namespace: komodo
-  labels:
-    helm.sh/chart: postgresql-17-fdb-cluster-6.16.1
-    app.kubernetes.io/name: komodo-postgresql-17-fdb
-    app.kubernetes.io/instance: komodo
-    app.kubernetes.io/part-of: komodo
-    app.kubernetes.io/version: "6.16.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  immediate: false
-  suspend: false
-  schedule: "0 0 0 * * *"
-  backupOwnerReference: self
-  cluster:
-    name: komodo-postgresql-17-fdb-cluster
-  method: plugin
-  pluginConfiguration:
-    name: barman-cloud.cloudnative-pg.io
-    parameters:
-      barmanObjectName: "komodo-postgresql-17-fdb-external-backup"

clusters/cl01tl/manifests/komodo/ScheduledBackup-komodo-postgresql-17-fdb-live-backup-scheduled-backup.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "komodo-postgresql-17-fdb-live-backup-scheduled-backup"
   namespace: komodo
   labels:
-    helm.sh/chart: postgresql-17-fdb-cluster-6.16.1
+    helm.sh/chart: postgresql-17-fdb-cluster-7.1.1
     app.kubernetes.io/name: komodo-postgresql-17-fdb
     app.kubernetes.io/instance: komodo
     app.kubernetes.io/part-of: komodo
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   immediate: true

clusters/cl01tl/manifests/lidarr/Cluster-lidarr-postgresql-18-cluster.yaml

@@ -4,11 +4,11 @@ metadata:
   name: lidarr-postgresql-18-cluster
   namespace: lidarr
   labels:
-    helm.sh/chart: postgres-18-cluster-6.17.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: lidarr-postgresql-18
     app.kubernetes.io/instance: lidarr
     app.kubernetes.io/part-of: lidarr
-    app.kubernetes.io/version: "6.17.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   instances: 3
@@ -16,26 +16,6 @@ spec:
   imagePullPolicy: IfNotPresent
   postgresUID: 26
   postgresGID: 26
-  plugins:
-    - name: barman-cloud.cloudnative-pg.io
-      enabled: true
-      isWALArchiver: false
-      parameters:
-        barmanObjectName: "lidarr-postgresql-18-external-backup"
-        serverName: "lidarr-postgresql-18-backup-1"
-    - name: barman-cloud.cloudnative-pg.io
-      enabled: true
-      isWALArchiver: true
-      parameters:
-        barmanObjectName: "lidarr-postgresql-18-garage-local-backup"
-        serverName: "lidarr-postgresql-18-backup-1"
-  externalClusters:
-    - name: recovery
-      plugin:
-        name: barman-cloud.cloudnative-pg.io
-        parameters:
-          barmanObjectName: "lidarr-postgresql-18-recovery"
-          serverName: lidarr-postgresql-18-backup-1
   storage:
     size: 10Gi
     storageClass: local-path
@@ -46,8 +26,8 @@ spec:
     limits:
       hugepages-2Mi: 256Mi
     requests:
-      cpu: 200m
+      cpu: 100m
-      memory: 1Gi
+      memory: 256Mi
   affinity:
     enablePodAntiAffinity: true
     topologyKey: kubernetes.io/hostname
@@ -64,6 +44,13 @@ spec:
   monitoring:
     enablePodMonitor: true
     disableDefaultQueries: false
+  plugins:
+    - name: barman-cloud.cloudnative-pg.io
+      enabled: true
+      isWALArchiver: true
+      parameters:
+        barmanObjectName: "lidarr-postgresql-18-garage-local-backup"
+        serverName: "lidarr-postgresql-18-backup-1"
   bootstrap:
     recovery:
       database: app

clusters/cl01tl/manifests/lidarr/ObjectStore-lidarr-postgresql-18-external-backup.yaml

@@ -1,24 +0,0 @@
-apiVersion: barmancloud.cnpg.io/v1
-kind: ObjectStore
-metadata:
-  name: "lidarr-postgresql-18-external-backup"
-  namespace: lidarr
-  labels:
-    helm.sh/chart: postgres-18-cluster-6.17.1
-    app.kubernetes.io/name: lidarr-postgresql-18
-    app.kubernetes.io/instance: lidarr
-    app.kubernetes.io/part-of: lidarr
-    app.kubernetes.io/version: "6.17.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  retentionPolicy: 30d
-  configuration:
-    destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/lidarr/lidarr-postgresql-18-cluster
-    endpointURL: https://nyc3.digitaloceanspaces.com
-    s3Credentials:
-      accessKeyId:
-        name: lidarr-postgresql-18-cluster-backup-secret
-        key: ACCESS_KEY_ID
-      secretAccessKey:
-        name: lidarr-postgresql-18-cluster-backup-secret
-        key: ACCESS_SECRET_KEY

clusters/cl01tl/manifests/lidarr/ObjectStore-lidarr-postgresql-18-garage-local-backup.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "lidarr-postgresql-18-garage-local-backup"
   namespace: lidarr
   labels:
-    helm.sh/chart: postgres-18-cluster-6.17.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: lidarr-postgresql-18
     app.kubernetes.io/instance: lidarr
     app.kubernetes.io/part-of: lidarr
-    app.kubernetes.io/version: "6.17.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   retentionPolicy: 3d

clusters/cl01tl/manifests/lidarr/ObjectStore-lidarr-postgresql-18-recovery.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "lidarr-postgresql-18-recovery"
   namespace: lidarr
   labels:
-    helm.sh/chart: postgres-18-cluster-6.17.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: lidarr-postgresql-18
     app.kubernetes.io/instance: lidarr
     app.kubernetes.io/part-of: lidarr
-    app.kubernetes.io/version: "6.17.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   configuration:

clusters/cl01tl/manifests/lidarr/PrometheusRule-lidarr-postgresql-18-alert-rules.yaml

@@ -4,11 +4,11 @@ metadata:
   name: lidarr-postgresql-18-alert-rules
   namespace: lidarr
   labels:
-    helm.sh/chart: postgres-18-cluster-6.17.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: lidarr-postgresql-18
     app.kubernetes.io/instance: lidarr
     app.kubernetes.io/part-of: lidarr
-    app.kubernetes.io/version: "6.17.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   groups:

clusters/cl01tl/manifests/lidarr/ScheduledBackup-lidarr-postgresql-18-daily-backup-scheduled-backup.yaml

@@ -1,24 +0,0 @@
-apiVersion: postgresql.cnpg.io/v1
-kind: ScheduledBackup
-metadata:
-  name: "lidarr-postgresql-18-daily-backup-scheduled-backup"
-  namespace: lidarr
-  labels:
-    helm.sh/chart: postgres-18-cluster-6.17.1
-    app.kubernetes.io/name: lidarr-postgresql-18
-    app.kubernetes.io/instance: lidarr
-    app.kubernetes.io/part-of: lidarr
-    app.kubernetes.io/version: "6.17.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  immediate: true
-  suspend: false
-  schedule: "0 0 0 * * *"
-  backupOwnerReference: self
-  cluster:
-    name: lidarr-postgresql-18-cluster
-  method: plugin
-  pluginConfiguration:
-    name: barman-cloud.cloudnative-pg.io
-    parameters:
-      barmanObjectName: "lidarr-postgresql-18-external-backup"

clusters/cl01tl/manifests/lidarr/ScheduledBackup-lidarr-postgresql-18-live-backup-scheduled-backup.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "lidarr-postgresql-18-live-backup-scheduled-backup"
   namespace: lidarr
   labels:
-    helm.sh/chart: postgres-18-cluster-6.17.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: lidarr-postgresql-18
     app.kubernetes.io/instance: lidarr
     app.kubernetes.io/part-of: lidarr
-    app.kubernetes.io/version: "6.17.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   immediate: true

clusters/cl01tl/manifests/matrix-synapse/Cluster-matrix-synapse-postgresql-18-cluster.yaml

@@ -4,11 +4,11 @@ metadata:
   name: matrix-synapse-postgresql-18-cluster
   namespace: matrix-synapse
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: matrix-synapse-postgresql-18
     app.kubernetes.io/instance: matrix-synapse
     app.kubernetes.io/part-of: matrix-synapse
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   instances: 3
@@ -16,26 +16,6 @@ spec:
   imagePullPolicy: IfNotPresent
   postgresUID: 26
   postgresGID: 26
-  plugins:
-    - name: barman-cloud.cloudnative-pg.io
-      enabled: true
-      isWALArchiver: false
-      parameters:
-        barmanObjectName: "matrix-synapse-postgresql-18-external-backup"
-        serverName: "matrix-synapse-postgresql-18-backup-1"
-    - name: barman-cloud.cloudnative-pg.io
-      enabled: true
-      isWALArchiver: true
-      parameters:
-        barmanObjectName: "matrix-synapse-postgresql-18-garage-local-backup"
-        serverName: "matrix-synapse-postgresql-18-backup-1"
-  externalClusters:
-    - name: recovery
-      plugin:
-        name: barman-cloud.cloudnative-pg.io
-        parameters:
-          barmanObjectName: "matrix-synapse-postgresql-18-recovery"
-          serverName: matrix-synapse-postgresql-18-backup-1
   storage:
     size: 10Gi
     storageClass: local-path
@@ -64,6 +44,13 @@ spec:
   monitoring:
     enablePodMonitor: true
     disableDefaultQueries: false
+  plugins:
+    - name: barman-cloud.cloudnative-pg.io
+      enabled: true
+      isWALArchiver: true
+      parameters:
+        barmanObjectName: "matrix-synapse-postgresql-18-garage-local-backup"
+        serverName: "matrix-synapse-postgresql-18-backup-1"
   bootstrap:
     recovery:
       database: app

clusters/cl01tl/manifests/matrix-synapse/Database-matrix-synapse-postgresql-18-cluster-mautrix-discord-database.yaml

@@ -1,14 +0,0 @@
-apiVersion: postgresql.cnpg.io/v1
-kind: Database
-metadata:
-  name: matrix-synapse-postgresql-18-cluster-mautrix-discord-database
-  namespace: matrix-synapse
-  labels:
-    app.kubernetes.io/name: matrix-synapse-postgresql-18-cluster-mautrix-discord-database
-    app.kubernetes.io/instance: matrix-synapse
-    app.kubernetes.io/part-of: matrix-synapse
-spec:
-  cluster:
-    name: matrix-synapse-postgresql-18-cluster
-  name: mautrix-discord
-  owner: app

clusters/cl01tl/manifests/matrix-synapse/Database-matrix-synapse-postgresql-18-cluster-mautrix-whatsapp-database.yaml

@@ -1,14 +0,0 @@
-apiVersion: postgresql.cnpg.io/v1
-kind: Database
-metadata:
-  name: matrix-synapse-postgresql-18-cluster-mautrix-whatsapp-database
-  namespace: matrix-synapse
-  labels:
-    app.kubernetes.io/name: matrix-synapse-postgresql-18-cluster-mautrix-whatsapp-database
-    app.kubernetes.io/instance: matrix-synapse
-    app.kubernetes.io/part-of: matrix-synapse
-spec:
-  cluster:
-    name: matrix-synapse-postgresql-18-cluster
-  name: mautrix-whatsapp
-  owner: app

clusters/cl01tl/manifests/matrix-synapse/Database-matrix-synapse-postgresql-18-database-mautrix-discord.yaml

@@ -0,0 +1,21 @@
+apiVersion: postgresql.cnpg.io/v1
+kind: Database
+metadata:
+  name: matrix-synapse-postgresql-18-database-mautrix-discord
+  namespace: matrix-synapse
+  labels:
+    helm.sh/chart: postgres-18-cluster-7.1.1
+    app.kubernetes.io/name: matrix-synapse-postgresql-18
+    app.kubernetes.io/instance: matrix-synapse
+    app.kubernetes.io/part-of: matrix-synapse
+    app.kubernetes.io/version: "7.1.1"
+    app.kubernetes.io/managed-by: Helm
+spec:
+  name: mautrix-discord
+  cluster:
+    name: matrix-synapse-postgresql-18
+  ensure: present
+  owner: app
+  template: template1
+  encoding: UTF8
+  databaseReclaimPolicy: retain

clusters/cl01tl/manifests/matrix-synapse/Database-matrix-synapse-postgresql-18-database-mautrix-whatsapp.yaml

@@ -0,0 +1,21 @@
+apiVersion: postgresql.cnpg.io/v1
+kind: Database
+metadata:
+  name: matrix-synapse-postgresql-18-database-mautrix-whatsapp
+  namespace: matrix-synapse
+  labels:
+    helm.sh/chart: postgres-18-cluster-7.1.1
+    app.kubernetes.io/name: matrix-synapse-postgresql-18
+    app.kubernetes.io/instance: matrix-synapse
+    app.kubernetes.io/part-of: matrix-synapse
+    app.kubernetes.io/version: "7.1.1"
+    app.kubernetes.io/managed-by: Helm
+spec:
+  name: mautrix-whatsapp
+  cluster:
+    name: matrix-synapse-postgresql-18
+  ensure: present
+  owner: app
+  template: template1
+  encoding: UTF8
+  databaseReclaimPolicy: retain

clusters/cl01tl/manifests/matrix-synapse/ObjectStore-matrix-synapse-postgresql-18-external-backup.yaml

@@ -1,24 +0,0 @@
-apiVersion: barmancloud.cnpg.io/v1
-kind: ObjectStore
-metadata:
-  name: "matrix-synapse-postgresql-18-external-backup"
-  namespace: matrix-synapse
-  labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
-    app.kubernetes.io/name: matrix-synapse-postgresql-18
-    app.kubernetes.io/instance: matrix-synapse
-    app.kubernetes.io/part-of: matrix-synapse
-    app.kubernetes.io/version: "6.16.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  retentionPolicy: 30d
-  configuration:
-    destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/matrix-synapse/matrix-synapse-postgresql-18-cluster
-    endpointURL: https://nyc3.digitaloceanspaces.com
-    s3Credentials:
-      accessKeyId:
-        name: matrix-synapse-postgresql-18-cluster-backup-secret
-        key: ACCESS_KEY_ID
-      secretAccessKey:
-        name: matrix-synapse-postgresql-18-cluster-backup-secret
-        key: ACCESS_SECRET_KEY

clusters/cl01tl/manifests/matrix-synapse/ObjectStore-matrix-synapse-postgresql-18-garage-local-backup.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "matrix-synapse-postgresql-18-garage-local-backup"
   namespace: matrix-synapse
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: matrix-synapse-postgresql-18
     app.kubernetes.io/instance: matrix-synapse
     app.kubernetes.io/part-of: matrix-synapse
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   retentionPolicy: 3d

clusters/cl01tl/manifests/matrix-synapse/ObjectStore-matrix-synapse-postgresql-18-recovery.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "matrix-synapse-postgresql-18-recovery"
   namespace: matrix-synapse
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: matrix-synapse-postgresql-18
     app.kubernetes.io/instance: matrix-synapse
     app.kubernetes.io/part-of: matrix-synapse
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   configuration:

clusters/cl01tl/manifests/matrix-synapse/PrometheusRule-matrix-synapse-postgresql-18-alert-rules.yaml

@@ -4,11 +4,11 @@ metadata:
   name: matrix-synapse-postgresql-18-alert-rules
   namespace: matrix-synapse
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: matrix-synapse-postgresql-18
     app.kubernetes.io/instance: matrix-synapse
     app.kubernetes.io/part-of: matrix-synapse
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   groups:

clusters/cl01tl/manifests/matrix-synapse/ScheduledBackup-matrix-synapse-postgresql-18-daily-backup-scheduled-backup.yaml

@@ -1,24 +0,0 @@
-apiVersion: postgresql.cnpg.io/v1
-kind: ScheduledBackup
-metadata:
-  name: "matrix-synapse-postgresql-18-daily-backup-scheduled-backup"
-  namespace: matrix-synapse
-  labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
-    app.kubernetes.io/name: matrix-synapse-postgresql-18
-    app.kubernetes.io/instance: matrix-synapse
-    app.kubernetes.io/part-of: matrix-synapse
-    app.kubernetes.io/version: "6.16.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  immediate: true
-  suspend: false
-  schedule: "0 0 0 * * *"
-  backupOwnerReference: self
-  cluster:
-    name: matrix-synapse-postgresql-18-cluster
-  method: plugin
-  pluginConfiguration:
-    name: barman-cloud.cloudnative-pg.io
-    parameters:
-      barmanObjectName: "matrix-synapse-postgresql-18-external-backup"

clusters/cl01tl/manifests/matrix-synapse/ScheduledBackup-matrix-synapse-postgresql-18-live-backup-scheduled-backup.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "matrix-synapse-postgresql-18-live-backup-scheduled-backup"
   namespace: matrix-synapse
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: matrix-synapse-postgresql-18
     app.kubernetes.io/instance: matrix-synapse
     app.kubernetes.io/part-of: matrix-synapse
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   immediate: true

clusters/cl01tl/manifests/n8n/Cluster-n8n-postgresql-18-cluster.yaml

@@ -4,11 +4,11 @@ metadata:
   name: n8n-postgresql-18-cluster
   namespace: n8n
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: n8n-postgresql-18
     app.kubernetes.io/instance: n8n
     app.kubernetes.io/part-of: n8n
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   instances: 3
@@ -16,26 +16,6 @@ spec:
   imagePullPolicy: IfNotPresent
   postgresUID: 26
   postgresGID: 26
-  plugins:
-    - name: barman-cloud.cloudnative-pg.io
-      enabled: true
-      isWALArchiver: false
-      parameters:
-        barmanObjectName: "n8n-postgresql-18-external-backup"
-        serverName: "n8n-postgresql-18-backup-1"
-    - name: barman-cloud.cloudnative-pg.io
-      enabled: true
-      isWALArchiver: true
-      parameters:
-        barmanObjectName: "n8n-postgresql-18-garage-local-backup"
-        serverName: "n8n-postgresql-18-backup-1"
-  externalClusters:
-    - name: recovery
-      plugin:
-        name: barman-cloud.cloudnative-pg.io
-        parameters:
-          barmanObjectName: "n8n-postgresql-18-recovery"
-          serverName: n8n-postgresql-18-backup-1
   storage:
     size: 10Gi
     storageClass: local-path
@@ -64,6 +44,13 @@ spec:
   monitoring:
     enablePodMonitor: true
     disableDefaultQueries: false
+  plugins:
+    - name: barman-cloud.cloudnative-pg.io
+      enabled: true
+      isWALArchiver: true
+      parameters:
+        barmanObjectName: "n8n-postgresql-18-garage-local-backup"
+        serverName: "n8n-postgresql-18-backup-1"
   bootstrap:
     recovery:
       database: app

clusters/cl01tl/manifests/n8n/ObjectStore-n8n-postgresql-18-external-backup.yaml

@@ -1,24 +0,0 @@
-apiVersion: barmancloud.cnpg.io/v1
-kind: ObjectStore
-metadata:
-  name: "n8n-postgresql-18-external-backup"
-  namespace: n8n
-  labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
-    app.kubernetes.io/name: n8n-postgresql-18
-    app.kubernetes.io/instance: n8n
-    app.kubernetes.io/part-of: n8n
-    app.kubernetes.io/version: "6.16.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  retentionPolicy: 30d
-  configuration:
-    destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/n8n/n8n-postgresql-18-cluster
-    endpointURL: https://nyc3.digitaloceanspaces.com
-    s3Credentials:
-      accessKeyId:
-        name: n8n-postgresql-18-cluster-backup-secret
-        key: ACCESS_KEY_ID
-      secretAccessKey:
-        name: n8n-postgresql-18-cluster-backup-secret
-        key: ACCESS_SECRET_KEY

clusters/cl01tl/manifests/n8n/ObjectStore-n8n-postgresql-18-garage-local-backup.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "n8n-postgresql-18-garage-local-backup"
   namespace: n8n
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: n8n-postgresql-18
     app.kubernetes.io/instance: n8n
     app.kubernetes.io/part-of: n8n
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   retentionPolicy: 3d

clusters/cl01tl/manifests/n8n/ObjectStore-n8n-postgresql-18-recovery.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "n8n-postgresql-18-recovery"
   namespace: n8n
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: n8n-postgresql-18
     app.kubernetes.io/instance: n8n
     app.kubernetes.io/part-of: n8n
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   configuration:

clusters/cl01tl/manifests/n8n/PrometheusRule-n8n-postgresql-18-alert-rules.yaml

@@ -4,11 +4,11 @@ metadata:
   name: n8n-postgresql-18-alert-rules
   namespace: n8n
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: n8n-postgresql-18
     app.kubernetes.io/instance: n8n
     app.kubernetes.io/part-of: n8n
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   groups:

clusters/cl01tl/manifests/n8n/ScheduledBackup-n8n-postgresql-18-daily-backup-scheduled-backup.yaml

@@ -1,24 +0,0 @@
-apiVersion: postgresql.cnpg.io/v1
-kind: ScheduledBackup
-metadata:
-  name: "n8n-postgresql-18-daily-backup-scheduled-backup"
-  namespace: n8n
-  labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
-    app.kubernetes.io/name: n8n-postgresql-18
-    app.kubernetes.io/instance: n8n
-    app.kubernetes.io/part-of: n8n
-    app.kubernetes.io/version: "6.16.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  immediate: true
-  suspend: false
-  schedule: "0 0 0 * * *"
-  backupOwnerReference: self
-  cluster:
-    name: n8n-postgresql-18-cluster
-  method: plugin
-  pluginConfiguration:
-    name: barman-cloud.cloudnative-pg.io
-    parameters:
-      barmanObjectName: "n8n-postgresql-18-external-backup"

clusters/cl01tl/manifests/n8n/ScheduledBackup-n8n-postgresql-18-live-backup-scheduled-backup.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "n8n-postgresql-18-live-backup-scheduled-backup"
   namespace: n8n
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: n8n-postgresql-18
     app.kubernetes.io/instance: n8n
     app.kubernetes.io/part-of: n8n
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   immediate: true

clusters/cl01tl/manifests/ollama/Cluster-ollama-web-postgresql-18-cluster.yaml

@@ -4,11 +4,11 @@ metadata:
   name: ollama-web-postgresql-18-cluster
   namespace: ollama
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: ollama-web-postgresql-18
     app.kubernetes.io/instance: ollama
     app.kubernetes.io/part-of: ollama
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   instances: 3
@@ -16,26 +16,6 @@ spec:
   imagePullPolicy: IfNotPresent
   postgresUID: 26
   postgresGID: 26
-  plugins:
-    - name: barman-cloud.cloudnative-pg.io
-      enabled: true
-      isWALArchiver: false
-      parameters:
-        barmanObjectName: "ollama-web-postgresql-18-external-backup"
-        serverName: "ollama-web-postgresql-18-backup-1"
-    - name: barman-cloud.cloudnative-pg.io
-      enabled: true
-      isWALArchiver: true
-      parameters:
-        barmanObjectName: "ollama-web-postgresql-18-garage-local-backup"
-        serverName: "ollama-web-postgresql-18-backup-1"
-  externalClusters:
-    - name: recovery
-      plugin:
-        name: barman-cloud.cloudnative-pg.io
-        parameters:
-          barmanObjectName: "ollama-web-postgresql-18-recovery"
-          serverName: ollama-web-postgresql-18-backup-1
   storage:
     size: 10Gi
     storageClass: local-path
@@ -64,6 +44,13 @@ spec:
   monitoring:
     enablePodMonitor: true
     disableDefaultQueries: false
+  plugins:
+    - name: barman-cloud.cloudnative-pg.io
+      enabled: true
+      isWALArchiver: true
+      parameters:
+        barmanObjectName: "ollama-web-postgresql-18-garage-local-backup"
+        serverName: "ollama-web-postgresql-18-backup-1"
   bootstrap:
     recovery:
       database: app

clusters/cl01tl/manifests/ollama/ObjectStore-ollama-web-postgresql-18-external-backup.yaml

@@ -1,24 +0,0 @@
-apiVersion: barmancloud.cnpg.io/v1
-kind: ObjectStore
-metadata:
-  name: "ollama-web-postgresql-18-external-backup"
-  namespace: ollama
-  labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
-    app.kubernetes.io/name: ollama-web-postgresql-18
-    app.kubernetes.io/instance: ollama
-    app.kubernetes.io/part-of: ollama
-    app.kubernetes.io/version: "6.16.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  retentionPolicy: 30d
-  configuration:
-    destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/ollama/ollama-web-postgresql-18-cluster
-    endpointURL: https://nyc3.digitaloceanspaces.com
-    s3Credentials:
-      accessKeyId:
-        name: ollama-web-postgresql-18-cluster-backup-secret
-        key: ACCESS_KEY_ID
-      secretAccessKey:
-        name: ollama-web-postgresql-18-cluster-backup-secret
-        key: ACCESS_SECRET_KEY

clusters/cl01tl/manifests/ollama/ObjectStore-ollama-web-postgresql-18-garage-local-backup.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "ollama-web-postgresql-18-garage-local-backup"
   namespace: ollama
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: ollama-web-postgresql-18
     app.kubernetes.io/instance: ollama
     app.kubernetes.io/part-of: ollama
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   retentionPolicy: 3d

clusters/cl01tl/manifests/ollama/ObjectStore-ollama-web-postgresql-18-recovery.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "ollama-web-postgresql-18-recovery"
   namespace: ollama
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: ollama-web-postgresql-18
     app.kubernetes.io/instance: ollama
     app.kubernetes.io/part-of: ollama
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   configuration:

clusters/cl01tl/manifests/ollama/PrometheusRule-ollama-web-postgresql-18-alert-rules.yaml

@@ -4,11 +4,11 @@ metadata:
   name: ollama-web-postgresql-18-alert-rules
   namespace: ollama
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: ollama-web-postgresql-18
     app.kubernetes.io/instance: ollama
     app.kubernetes.io/part-of: ollama
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   groups:

clusters/cl01tl/manifests/ollama/ScheduledBackup-ollama-web-postgresql-18-daily-backup-scheduled-backup.yaml

@@ -1,24 +0,0 @@
-apiVersion: postgresql.cnpg.io/v1
-kind: ScheduledBackup
-metadata:
-  name: "ollama-web-postgresql-18-daily-backup-scheduled-backup"
-  namespace: ollama
-  labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
-    app.kubernetes.io/name: ollama-web-postgresql-18
-    app.kubernetes.io/instance: ollama
-    app.kubernetes.io/part-of: ollama
-    app.kubernetes.io/version: "6.16.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  immediate: true
-  suspend: false
-  schedule: "0 0 0 * * *"
-  backupOwnerReference: self
-  cluster:
-    name: ollama-web-postgresql-18-cluster
-  method: plugin
-  pluginConfiguration:
-    name: barman-cloud.cloudnative-pg.io
-    parameters:
-      barmanObjectName: "ollama-web-postgresql-18-external-backup"

clusters/cl01tl/manifests/ollama/ScheduledBackup-ollama-web-postgresql-18-live-backup-scheduled-backup.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "ollama-web-postgresql-18-live-backup-scheduled-backup"
   namespace: ollama
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: ollama-web-postgresql-18
     app.kubernetes.io/instance: ollama
     app.kubernetes.io/part-of: ollama
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   immediate: true

clusters/cl01tl/manifests/outline/Cluster-outline-postgresql-18-cluster.yaml

@@ -4,11 +4,11 @@ metadata:
   name: outline-postgresql-18-cluster
   namespace: outline
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: outline-postgresql-18
     app.kubernetes.io/instance: outline
     app.kubernetes.io/part-of: outline
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   instances: 3
@@ -16,26 +16,6 @@ spec:
   imagePullPolicy: IfNotPresent
   postgresUID: 26
   postgresGID: 26
-  plugins:
-    - name: barman-cloud.cloudnative-pg.io
-      enabled: true
-      isWALArchiver: false
-      parameters:
-        barmanObjectName: "outline-postgresql-18-external-backup"
-        serverName: "outline-postgresql-18-backup-1"
-    - name: barman-cloud.cloudnative-pg.io
-      enabled: true
-      isWALArchiver: true
-      parameters:
-        barmanObjectName: "outline-postgresql-18-garage-local-backup"
-        serverName: "outline-postgresql-18-backup-1"
-  externalClusters:
-    - name: recovery
-      plugin:
-        name: barman-cloud.cloudnative-pg.io
-        parameters:
-          barmanObjectName: "outline-postgresql-18-recovery"
-          serverName: outline-postgresql-18-backup-1
   storage:
     size: 10Gi
     storageClass: local-path
@@ -64,6 +44,13 @@ spec:
   monitoring:
     enablePodMonitor: true
     disableDefaultQueries: false
+  plugins:
+    - name: barman-cloud.cloudnative-pg.io
+      enabled: true
+      isWALArchiver: true
+      parameters:
+        barmanObjectName: "outline-postgresql-18-garage-local-backup"
+        serverName: "outline-postgresql-18-backup-1"
   bootstrap:
     recovery:
       database: app

clusters/cl01tl/manifests/outline/ObjectStore-outline-postgresql-18-external-backup.yaml

@@ -1,24 +0,0 @@
-apiVersion: barmancloud.cnpg.io/v1
-kind: ObjectStore
-metadata:
-  name: "outline-postgresql-18-external-backup"
-  namespace: outline
-  labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
-    app.kubernetes.io/name: outline-postgresql-18
-    app.kubernetes.io/instance: outline
-    app.kubernetes.io/part-of: outline
-    app.kubernetes.io/version: "6.16.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  retentionPolicy: 30d
-  configuration:
-    destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/outline/outline-postgresql-18-cluster
-    endpointURL: https://nyc3.digitaloceanspaces.com
-    s3Credentials:
-      accessKeyId:
-        name: outline-postgresql-18-cluster-backup-secret
-        key: ACCESS_KEY_ID
-      secretAccessKey:
-        name: outline-postgresql-18-cluster-backup-secret
-        key: ACCESS_SECRET_KEY

clusters/cl01tl/manifests/outline/ObjectStore-outline-postgresql-18-garage-local-backup.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "outline-postgresql-18-garage-local-backup"
   namespace: outline
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: outline-postgresql-18
     app.kubernetes.io/instance: outline
     app.kubernetes.io/part-of: outline
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   retentionPolicy: 3d

clusters/cl01tl/manifests/outline/ObjectStore-outline-postgresql-18-recovery.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "outline-postgresql-18-recovery"
   namespace: outline
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: outline-postgresql-18
     app.kubernetes.io/instance: outline
     app.kubernetes.io/part-of: outline
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   configuration:

clusters/cl01tl/manifests/outline/PrometheusRule-outline-postgresql-18-alert-rules.yaml

@@ -4,11 +4,11 @@ metadata:
   name: outline-postgresql-18-alert-rules
   namespace: outline
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: outline-postgresql-18
     app.kubernetes.io/instance: outline
     app.kubernetes.io/part-of: outline
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   groups:

clusters/cl01tl/manifests/outline/ScheduledBackup-outline-postgresql-18-daily-backup-scheduled-backup.yaml

@@ -1,24 +0,0 @@
-apiVersion: postgresql.cnpg.io/v1
-kind: ScheduledBackup
-metadata:
-  name: "outline-postgresql-18-daily-backup-scheduled-backup"
-  namespace: outline
-  labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
-    app.kubernetes.io/name: outline-postgresql-18
-    app.kubernetes.io/instance: outline
-    app.kubernetes.io/part-of: outline
-    app.kubernetes.io/version: "6.16.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  immediate: true
-  suspend: false
-  schedule: "0 0 0 * * *"
-  backupOwnerReference: self
-  cluster:
-    name: outline-postgresql-18-cluster
-  method: plugin
-  pluginConfiguration:
-    name: barman-cloud.cloudnative-pg.io
-    parameters:
-      barmanObjectName: "outline-postgresql-18-external-backup"

clusters/cl01tl/manifests/outline/ScheduledBackup-outline-postgresql-18-live-backup-scheduled-backup.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "outline-postgresql-18-live-backup-scheduled-backup"
   namespace: outline
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: outline-postgresql-18
     app.kubernetes.io/instance: outline
     app.kubernetes.io/part-of: outline
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   immediate: true

clusters/cl01tl/manifests/photoview/Cluster-photoview-postgresql-18-cluster.yaml

@@ -4,11 +4,11 @@ metadata:
   name: photoview-postgresql-18-cluster
   namespace: photoview
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: photoview-postgresql-18
     app.kubernetes.io/instance: photoview
     app.kubernetes.io/part-of: photoview
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   instances: 3
@@ -16,26 +16,6 @@ spec:
   imagePullPolicy: IfNotPresent
   postgresUID: 26
   postgresGID: 26
-  plugins:
-    - name: barman-cloud.cloudnative-pg.io
-      enabled: true
-      isWALArchiver: false
-      parameters:
-        barmanObjectName: "photoview-postgresql-18-external-backup"
-        serverName: "photoview-postgresql-18-backup-1"
-    - name: barman-cloud.cloudnative-pg.io
-      enabled: true
-      isWALArchiver: true
-      parameters:
-        barmanObjectName: "photoview-postgresql-18-garage-local-backup"
-        serverName: "photoview-postgresql-18-backup-1"
-  externalClusters:
-    - name: recovery
-      plugin:
-        name: barman-cloud.cloudnative-pg.io
-        parameters:
-          barmanObjectName: "photoview-postgresql-18-recovery"
-          serverName: photoview-postgresql-18-backup-1
   storage:
     size: 10Gi
     storageClass: local-path
@@ -64,6 +44,13 @@ spec:
   monitoring:
     enablePodMonitor: true
     disableDefaultQueries: false
+  plugins:
+    - name: barman-cloud.cloudnative-pg.io
+      enabled: true
+      isWALArchiver: true
+      parameters:
+        barmanObjectName: "photoview-postgresql-18-garage-local-backup"
+        serverName: "photoview-postgresql-18-backup-1"
   bootstrap:
     recovery:
       database: app

clusters/cl01tl/manifests/photoview/ObjectStore-photoview-postgresql-18-external-backup.yaml

@@ -1,24 +0,0 @@
-apiVersion: barmancloud.cnpg.io/v1
-kind: ObjectStore
-metadata:
-  name: "photoview-postgresql-18-external-backup"
-  namespace: photoview
-  labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
-    app.kubernetes.io/name: photoview-postgresql-18
-    app.kubernetes.io/instance: photoview
-    app.kubernetes.io/part-of: photoview
-    app.kubernetes.io/version: "6.16.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  retentionPolicy: 30d
-  configuration:
-    destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/photoview/photoview-postgresql-18-cluster
-    endpointURL: https://nyc3.digitaloceanspaces.com
-    s3Credentials:
-      accessKeyId:
-        name: photoview-postgresql-18-cluster-backup-secret
-        key: ACCESS_KEY_ID
-      secretAccessKey:
-        name: photoview-postgresql-18-cluster-backup-secret
-        key: ACCESS_SECRET_KEY

clusters/cl01tl/manifests/photoview/ObjectStore-photoview-postgresql-18-garage-local-backup.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "photoview-postgresql-18-garage-local-backup"
   namespace: photoview
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: photoview-postgresql-18
     app.kubernetes.io/instance: photoview
     app.kubernetes.io/part-of: photoview
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   retentionPolicy: 3d

clusters/cl01tl/manifests/photoview/ObjectStore-photoview-postgresql-18-recovery.yaml

@@ -4,11 +4,11 @@ metadata:
   name: "photoview-postgresql-18-recovery"
   namespace: photoview
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: photoview-postgresql-18
     app.kubernetes.io/instance: photoview
     app.kubernetes.io/part-of: photoview
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   configuration:

clusters/cl01tl/manifests/photoview/PrometheusRule-photoview-postgresql-18-alert-rules.yaml

@@ -4,11 +4,11 @@ metadata:
   name: photoview-postgresql-18-alert-rules
   namespace: photoview
   labels:
-    helm.sh/chart: postgres-18-cluster-6.16.1
+    helm.sh/chart: postgres-18-cluster-7.1.1
     app.kubernetes.io/name: photoview-postgresql-18
     app.kubernetes.io/instance: photoview
     app.kubernetes.io/part-of: photoview
-    app.kubernetes.io/version: "6.16.1"
+    app.kubernetes.io/version: "7.1.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   groups: