diff --git a/clusters/cl01tl/manifests/grafana-operator/Cluster-grafana-operator-postgresql-18-cluster.yaml b/clusters/cl01tl/manifests/grafana-operator/Cluster-grafana-operator-postgresql-18-cluster.yaml index 17b17fa5c..98a6d04e6 100644 --- a/clusters/cl01tl/manifests/grafana-operator/Cluster-grafana-operator-postgresql-18-cluster.yaml +++ b/clusters/cl01tl/manifests/grafana-operator/Cluster-grafana-operator-postgresql-18-cluster.yaml @@ -29,13 +29,6 @@ spec: 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 @@ -65,15 +58,22 @@ spec: enablePodMonitor: true disableDefaultQueries: false bootstrap: - recovery: - database: app - source: grafana-operator-postgresql-18-backup-1 + initdb: + import: + source: + externalCluster: importSource + type: microservice + databases: + - app + schemaOnly: false externalClusters: - - name: grafana-operator-postgresql-18-backup-1 - plugin: - name: barman-cloud.cloudnative-pg.io - enabled: true - isWALArchiver: false - parameters: - barmanObjectName: "grafana-operator-postgresql-18-recovery" - serverName: grafana-operator-postgresql-18-backup-1 + - name: importSource + connectionParameters: + host: "grafana-operator-postgresql-17-cluster-rw" + port: "5432" + user: "app" + dbname: "app" + sslmode: "disable" + password: + name: grafana-operator-postgresql-17-cluster-app + key: password diff --git a/clusters/cl01tl/manifests/grafana-operator/ObjectStore-grafana-operator-postgresql-18-recovery.yaml b/clusters/cl01tl/manifests/grafana-operator/ObjectStore-grafana-operator-postgresql-18-recovery.yaml deleted file mode 100644 index c069dd278..000000000 --- a/clusters/cl01tl/manifests/grafana-operator/ObjectStore-grafana-operator-postgresql-18-recovery.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: barmancloud.cnpg.io/v1 -kind: ObjectStore -metadata: - name: "grafana-operator-postgresql-18-recovery" - 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: - configuration: - destinationPath: s3://postgres-backups/cl01tl/grafana-operator/grafana-operator-postgresql-18-cluster - endpointURL: http://garage-main.garage:3900 - wal: - compression: snappy - maxParallel: 1 - data: - compression: snappy - jobs: 1 - s3Credentials: - accessKeyId: - name: grafana-operator-postgresql-18-cluster-backup-secret-garage - key: ACCESS_KEY_ID - secretAccessKey: - name: grafana-operator-postgresql-18-cluster-backup-secret-garage - key: ACCESS_SECRET_KEY