From 5a63b2cfb066dc5b97e7abbd88c6b73cb7a43553 Mon Sep 17 00:00:00 2001 From: Conan Scott Date: Tue, 30 Dec 2025 15:51:50 +1100 Subject: [PATCH] made changes for consistency --- @ | 48 +++++++++++++++++++++++++++++++++++++++++++ config-backups.yaml | 4 +--- dpa.yaml | 2 +- stateful-backups.yaml | 11 +++------- 4 files changed, 53 insertions(+), 12 deletions(-) create mode 100644 @ diff --git a/@ b/@ new file mode 100644 index 0000000..d2e8ea3 --- /dev/null +++ b/@ @@ -0,0 +1,48 @@ +apiVersion: oadp.openshift.io/v1alpha1 +kind: DataProtectionApplication +metadata: + name: dpa-minio + namespace: openshift-adp +spec: + backupImages: false + + backupLocations: + - name: default + velero: + provider: aws + default: true + credential: + name: cloud-credentials + key: cloud + objectStorage: + bucket: oadp + prefix: velero + config: + profile: default + region: ap-southeast-2 + s3ForcePathStyle: "true" + s3Url: http://minio.minio.svc.cluster.local:9000 + insecureSkipTLSVerify: "true" + + configuration: + nodeAgent: + enable: true + uploaderType: kopia + velero: + defaultPlugins: + - openshift + - aws + - csi + - kubevirt + defaultSnapshotMoveData: true + disableFsBackup: false + podConfig: + resourceAllocations: + limits: + cpu: "500m" + memory: "512Mi" + requests: + cpu: "100m" + memory: "256Mi" + + logFormat: text diff --git a/config-backups.yaml b/config-backups.yaml index 8dbf38e..ee30c6a 100644 --- a/config-backups.yaml +++ b/config-backups.yaml @@ -4,8 +4,7 @@ metadata: name: daily-config namespace: openshift-adp spec: - # Run at 02:00 daily AEST - schedule: "0 15 * * *" + schedule: "0 02 * * *" # Make backups readable, sortable, unique nameTemplate: "{{ .ScheduleName }}-{{ .Timestamp }}" @@ -18,5 +17,4 @@ spec: snapshotVolumes: false defaultVolumesToFsBackup: false - # Retain for one week (adjust later) ttl: 336h diff --git a/dpa.yaml b/dpa.yaml index d2e8ea3..7b08fd2 100644 --- a/dpa.yaml +++ b/dpa.yaml @@ -34,7 +34,7 @@ spec: - aws - csi - kubevirt - defaultSnapshotMoveData: true + defaultSnapshotMoveData: false disableFsBackup: false podConfig: resourceAllocations: diff --git a/stateful-backups.yaml b/stateful-backups.yaml index f586638..3347e77 100644 --- a/stateful-backups.yaml +++ b/stateful-backups.yaml @@ -4,10 +4,8 @@ metadata: name: daily-stateful namespace: openshift-adp spec: - # Run at 04:00 (after config-only) AEST - schedule: "0 16 * * *" + schedule: "0 03 * * *" - # Timestamped names for long-term retention nameTemplate: "{{ .ScheduleName }}-{{ .Timestamp }}" template: @@ -19,13 +17,10 @@ spec: - n8n - apim - gitea-ci - - vm-project - # add others here as needed - # No CSI snapshots; use nodeAgent/restic only + # No CSI snapshots; use nodeAgent/kopia only snapshotVolumes: false defaultVolumesToFsBackup: true - # Retain a bit longer - ttl: 336h # 30 days + ttl: 336h