From bd313eed5590c1947c2f289ee5f144a9e2cb6daf Mon Sep 17 00:00:00 2001 From: gitea-bot Date: Fri, 12 Dec 2025 01:17:51 +0000 Subject: [PATCH] chore: Update manifests after change --- ...rafana-operator-postgresql-18-cluster.yaml | 36 +++++++++---------- .../Grafana-grafana-main.yaml | 10 +++--- ...afana-operator-postgresql-18-recovery.yaml | 29 +++++++++++++++ 3 files changed, 52 insertions(+), 23 deletions(-) create mode 100644 clusters/cl01tl/manifests/grafana-operator/ObjectStore-grafana-operator-postgresql-18-recovery.yaml 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 98a6d04e6..17b17fa5c 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,6 +29,13 @@ 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 @@ -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: grafana-operator-postgresql-18-backup-1 externalClusters: - - 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 + - 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 diff --git a/clusters/cl01tl/manifests/grafana-operator/Grafana-grafana-main.yaml b/clusters/cl01tl/manifests/grafana-operator/Grafana-grafana-main.yaml index c5d1e3f6d..956b5e565 100644 --- a/clusters/cl01tl/manifests/grafana-operator/Grafana-grafana-main.yaml +++ b/clusters/cl01tl/manifests/grafana-operator/Grafana-grafana-main.yaml @@ -85,25 +85,25 @@ spec: - name: DB_HOST valueFrom: secretKeyRef: - name: grafana-operator-postgresql-17-cluster-app + name: grafana-operator-postgresql-18-cluster-app key: host - name: DB_DATABASE valueFrom: secretKeyRef: - name: grafana-operator-postgresql-17-cluster-app + name: grafana-operator-postgresql-18-cluster-app key: dbname - name: DB_PORT valueFrom: secretKeyRef: - name: grafana-operator-postgresql-17-cluster-app + name: grafana-operator-postgresql-18-cluster-app key: port - name: DB_USER valueFrom: secretKeyRef: - name: grafana-operator-postgresql-17-cluster-app + name: grafana-operator-postgresql-18-cluster-app key: user - name: DB_PASSWORD valueFrom: secretKeyRef: - name: grafana-operator-postgresql-17-cluster-app + name: grafana-operator-postgresql-18-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 new file mode 100644 index 000000000..c069dd278 --- /dev/null +++ b/clusters/cl01tl/manifests/grafana-operator/ObjectStore-grafana-operator-postgresql-18-recovery.yaml @@ -0,0 +1,29 @@ +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 -- 2.49.1