diff --git a/clusters/cl01tl/manifests/outline/Cluster-outline-postgresql-18-cluster.yaml b/clusters/cl01tl/manifests/outline/Cluster-outline-postgresql-18-cluster.yaml index 3c7e72fad..778353029 100644 --- a/clusters/cl01tl/manifests/outline/Cluster-outline-postgresql-18-cluster.yaml +++ b/clusters/cl01tl/manifests/outline/Cluster-outline-postgresql-18-cluster.yaml @@ -29,6 +29,13 @@ spec: 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 @@ -58,22 +65,15 @@ spec: enablePodMonitor: true disableDefaultQueries: false bootstrap: - initdb: - import: - source: - externalCluster: importSource - type: microservice - databases: - - app - schemaOnly: false + recovery: + database: app + source: outline-postgresql-18-backup-1 externalClusters: - - name: importSource - connectionParameters: - host: "outline-postgresql-17-cluster-rw" - port: "5432" - user: "app" - dbname: "app" - sslmode: "disable" - password: - name: outline-postgresql-17-cluster-app - key: password + - name: outline-postgresql-18-backup-1 + plugin: + name: barman-cloud.cloudnative-pg.io + enabled: true + isWALArchiver: false + parameters: + barmanObjectName: "outline-postgresql-18-recovery" + serverName: outline-postgresql-18-backup-1 diff --git a/clusters/cl01tl/manifests/outline/Deployment-outline.yaml b/clusters/cl01tl/manifests/outline/Deployment-outline.yaml index be0eff8dd..fdca401e7 100644 --- a/clusters/cl01tl/manifests/outline/Deployment-outline.yaml +++ b/clusters/cl01tl/manifests/outline/Deployment-outline.yaml @@ -55,27 +55,27 @@ spec: valueFrom: secretKeyRef: key: username - name: outline-postgresql-17-cluster-app + name: outline-postgresql-18-cluster-app - name: POSTGRES_PASSWORD valueFrom: secretKeyRef: key: password - name: outline-postgresql-17-cluster-app + name: outline-postgresql-18-cluster-app - name: POSTGRES_DATABASE_NAME valueFrom: secretKeyRef: key: dbname - name: outline-postgresql-17-cluster-app + name: outline-postgresql-18-cluster-app - name: POSTGRES_DATABASE_HOST valueFrom: secretKeyRef: key: host - name: outline-postgresql-17-cluster-app + name: outline-postgresql-18-cluster-app - name: POSTGRES_DATABASE_PORT valueFrom: secretKeyRef: key: port - name: outline-postgresql-17-cluster-app + name: outline-postgresql-18-cluster-app - name: DATABASE_URL value: postgres://$(POSTGRES_USERNAME):$(POSTGRES_PASSWORD)@$(POSTGRES_DATABASE_HOST):$(POSTGRES_DATABASE_PORT)/$(POSTGRES_DATABASE_NAME) - name: DATABASE_URL_TEST diff --git a/clusters/cl01tl/manifests/outline/ObjectStore-outline-postgresql-18-recovery.yaml b/clusters/cl01tl/manifests/outline/ObjectStore-outline-postgresql-18-recovery.yaml new file mode 100644 index 000000000..cc5449fc6 --- /dev/null +++ b/clusters/cl01tl/manifests/outline/ObjectStore-outline-postgresql-18-recovery.yaml @@ -0,0 +1,29 @@ +apiVersion: barmancloud.cnpg.io/v1 +kind: ObjectStore +metadata: + name: "outline-postgresql-18-recovery" + 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: + configuration: + destinationPath: s3://postgres-backups/cl01tl/outline/outline-postgresql-18-cluster + endpointURL: http://garage-main.garage:3900 + wal: + compression: snappy + maxParallel: 1 + data: + compression: snappy + jobs: 1 + s3Credentials: + accessKeyId: + name: outline-postgresql-18-cluster-backup-secret-garage + key: ACCESS_KEY_ID + secretAccessKey: + name: outline-postgresql-18-cluster-backup-secret-garage + key: ACCESS_SECRET_KEY