diff --git a/docs/content/how-to/disaster-recovery/backup-and-restore-oadp-1-5.md b/docs/content/how-to/disaster-recovery/backup-and-restore-oadp-1-5.md index ca60e32f1866..5003ef0d2a89 100644 --- a/docs/content/how-to/disaster-recovery/backup-and-restore-oadp-1-5.md +++ b/docs/content/how-to/disaster-recovery/backup-and-restore-oadp-1-5.md @@ -91,15 +91,6 @@ Below are some samples of DPA configurations for the mentioned platforms credential: key: cloud name: cloud-credentials - snapshotLocations: - - velero: - provider: aws - config: - region: us-east-1 - profile: "volumeSnapshot" - credential: - key: cloud - name: cloud-credentials configuration: nodeAgent: enable: true @@ -141,15 +132,6 @@ Below are some samples of DPA configurations for the mentioned platforms key: cloud name: cloud-credentials default: true - snapshotLocations: - - velero: - provider: aws - config: - region: minio - profile: "default" - credential: - key: cloud - name: cloud-credentials configuration: nodeAgent: enable: true @@ -187,15 +169,6 @@ Below are some samples of DPA configurations for the mentioned platforms credential: key: cloud name: cloud-credentials - snapshotLocations: - - velero: - provider: aws - config: - region: minio - profile: "default" - credential: - key: cloud - name: cloud-credentials configuration: nodeAgent: enable: true diff --git a/docs/content/how-to/disaster-recovery/backup-and-restore-oadp.md b/docs/content/how-to/disaster-recovery/backup-and-restore-oadp.md index 12a3ceeedc7a..d1204f4dc38e 100644 --- a/docs/content/how-to/disaster-recovery/backup-and-restore-oadp.md +++ b/docs/content/how-to/disaster-recovery/backup-and-restore-oadp.md @@ -71,15 +71,6 @@ Below are some samples of DPA configurations for the mentioned platforms key: cloud name: cloud-credentials default: true - snapshotLocations: - - velero: - provider: aws - config: - region: minio - profile: "default" - credential: - key: cloud - name: cloud-credentials configuration: nodeAgent: enable: true @@ -91,7 +82,7 @@ Below are some samples of DPA configurations for the mentioned platforms - csi customPlugins: - name: hypershift-oadp-plugin - image: quay.io/redhat-user-workloads/ocp-art-tenant/oadp-hypershift-oadp-plugin-main:main + image: quay.io/konveyor/hypershift-oadp-plugin:latest resourceTimeout: 2h ``` @@ -120,15 +111,6 @@ Below are some samples of DPA configurations for the mentioned platforms credential: key: cloud name: cloud-credentials - snapshotLocations: - - velero: - provider: aws - config: - region: us-east-1 - profile: "volumeSnapshot" - credential: - key: cloud - name: cloud-credentials configuration: nodeAgent: enable: true @@ -140,7 +122,7 @@ Below are some samples of DPA configurations for the mentioned platforms - csi customPlugins: - name: hypershift-oadp-plugin - image: quay.io/redhat-user-workloads/ocp-art-tenant/oadp-hypershift-oadp-plugin-main:main + image: quay.io/konveyor/hypershift-oadp-plugin:latest resourceTimeout: 2h ``` @@ -169,15 +151,6 @@ Below are some samples of DPA configurations for the mentioned platforms bucket: example-oadp prefix: backup-objects provider: aws - snapshotLocations: - - velero: - provider: aws - config: - region: region-one - profile: "default" - credential: - key: cloud - name: cloud-credentials configuration: nodeAgent: enable: true @@ -190,7 +163,7 @@ Below are some samples of DPA configurations for the mentioned platforms - csi customPlugins: - name: hypershift-oadp-plugin - image: quay.io/redhat-user-workloads/ocp-art-tenant/oadp-hypershift-oadp-plugin-main:main + image: quay.io/konveyor/hypershift-oadp-plugin:latest resourceTimeout: 2h ``` @@ -221,15 +194,6 @@ Below are some samples of DPA configurations for the mentioned platforms bucket: example-oadp prefix: backup-objects provider: aws - snapshotLocations: - - velero: - provider: aws - config: - region: region-one - profile: "default" - credential: - key: cloud - name: cloud-credentials configuration: nodeAgent: enable: true @@ -242,7 +206,7 @@ Below are some samples of DPA configurations for the mentioned platforms - csi customPlugins: - name: hypershift-oadp-plugin - image: quay.io/redhat-user-workloads/ocp-art-tenant/oadp-hypershift-oadp-plugin-main:main + image: quay.io/konveyor/hypershift-oadp-plugin:latest resourceTimeout: 2h ``` diff --git a/docs/content/how-to/disaster-recovery/platform-guides/agent.md b/docs/content/how-to/disaster-recovery/platform-guides/agent.md index ee11e471c63e..8af7e6843166 100644 --- a/docs/content/how-to/disaster-recovery/platform-guides/agent.md +++ b/docs/content/how-to/disaster-recovery/platform-guides/agent.md @@ -55,15 +55,6 @@ spec: key: cloud name: cloud-credentials default: true - snapshotLocations: - - velero: - provider: aws - config: - region: minio - profile: "default" - credential: - key: cloud - name: cloud-credentials configuration: nodeAgent: enable: true diff --git a/docs/content/how-to/disaster-recovery/platform-guides/aws.md b/docs/content/how-to/disaster-recovery/platform-guides/aws.md index 77cb30a6e26a..f9aa6a23a4b2 100644 --- a/docs/content/how-to/disaster-recovery/platform-guides/aws.md +++ b/docs/content/how-to/disaster-recovery/platform-guides/aws.md @@ -100,15 +100,6 @@ spec: credential: key: cloud name: cloud-credentials - snapshotLocations: - - velero: - provider: aws - config: - region: us-east-1 - profile: "volumeSnapshot" - credential: - key: cloud - name: cloud-credentials configuration: nodeAgent: enable: true diff --git a/docs/content/how-to/disaster-recovery/platform-guides/kubevirt.md b/docs/content/how-to/disaster-recovery/platform-guides/kubevirt.md index 8ec6c63d9597..5918bb863927 100644 --- a/docs/content/how-to/disaster-recovery/platform-guides/kubevirt.md +++ b/docs/content/how-to/disaster-recovery/platform-guides/kubevirt.md @@ -44,15 +44,6 @@ spec: bucket: example-oadp prefix: backup-objects provider: aws - snapshotLocations: - - velero: - provider: aws - config: - region: region-one - profile: "default" - credential: - key: cloud - name: cloud-credentials configuration: nodeAgent: enable: true diff --git a/docs/content/how-to/disaster-recovery/platform-guides/openstack.md b/docs/content/how-to/disaster-recovery/platform-guides/openstack.md index dc6fa55356a5..84b93f0170cc 100644 --- a/docs/content/how-to/disaster-recovery/platform-guides/openstack.md +++ b/docs/content/how-to/disaster-recovery/platform-guides/openstack.md @@ -41,15 +41,6 @@ spec: credential: key: cloud name: cloud-credentials - snapshotLocations: - - velero: - provider: aws - config: - region: minio - profile: "default" - credential: - key: cloud - name: cloud-credentials configuration: nodeAgent: enable: true diff --git a/docs/content/reference/aggregated-docs.md b/docs/content/reference/aggregated-docs.md index 2ed11311c089..2fd5a6d22e2d 100644 --- a/docs/content/reference/aggregated-docs.md +++ b/docs/content/reference/aggregated-docs.md @@ -17385,15 +17385,6 @@ Below are some samples of DPA configurations for the mentioned platforms credential: key: cloud name: cloud-credentials - snapshotLocations: - - velero: - provider: aws - config: - region: us-east-1 - profile: "volumeSnapshot" - credential: - key: cloud - name: cloud-credentials configuration: nodeAgent: enable: true @@ -17435,15 +17426,6 @@ Below are some samples of DPA configurations for the mentioned platforms key: cloud name: cloud-credentials default: true - snapshotLocations: - - velero: - provider: aws - config: - region: minio - profile: "default" - credential: - key: cloud - name: cloud-credentials configuration: nodeAgent: enable: true @@ -17481,15 +17463,6 @@ Below are some samples of DPA configurations for the mentioned platforms credential: key: cloud name: cloud-credentials - snapshotLocations: - - velero: - provider: aws - config: - region: minio - profile: "default" - credential: - key: cloud - name: cloud-credentials configuration: nodeAgent: enable: true @@ -18414,15 +18387,6 @@ Below are some samples of DPA configurations for the mentioned platforms key: cloud name: cloud-credentials default: true - snapshotLocations: - - velero: - provider: aws - config: - region: minio - profile: "default" - credential: - key: cloud - name: cloud-credentials configuration: nodeAgent: enable: true @@ -18434,7 +18398,7 @@ Below are some samples of DPA configurations for the mentioned platforms - csi customPlugins: - name: hypershift-oadp-plugin - image: quay.io/redhat-user-workloads/ocp-art-tenant/oadp-hypershift-oadp-plugin-main:main + image: quay.io/konveyor/hypershift-oadp-plugin:latest resourceTimeout: 2h ``` @@ -18463,15 +18427,6 @@ Below are some samples of DPA configurations for the mentioned platforms credential: key: cloud name: cloud-credentials - snapshotLocations: - - velero: - provider: aws - config: - region: us-east-1 - profile: "volumeSnapshot" - credential: - key: cloud - name: cloud-credentials configuration: nodeAgent: enable: true @@ -18483,7 +18438,7 @@ Below are some samples of DPA configurations for the mentioned platforms - csi customPlugins: - name: hypershift-oadp-plugin - image: quay.io/redhat-user-workloads/ocp-art-tenant/oadp-hypershift-oadp-plugin-main:main + image: quay.io/konveyor/hypershift-oadp-plugin:latest resourceTimeout: 2h ``` @@ -18512,15 +18467,6 @@ Below are some samples of DPA configurations for the mentioned platforms bucket: example-oadp prefix: backup-objects provider: aws - snapshotLocations: - - velero: - provider: aws - config: - region: region-one - profile: "default" - credential: - key: cloud - name: cloud-credentials configuration: nodeAgent: enable: true @@ -18533,7 +18479,7 @@ Below are some samples of DPA configurations for the mentioned platforms - csi customPlugins: - name: hypershift-oadp-plugin - image: quay.io/redhat-user-workloads/ocp-art-tenant/oadp-hypershift-oadp-plugin-main:main + image: quay.io/konveyor/hypershift-oadp-plugin:latest resourceTimeout: 2h ``` @@ -18564,15 +18510,6 @@ Below are some samples of DPA configurations for the mentioned platforms bucket: example-oadp prefix: backup-objects provider: aws - snapshotLocations: - - velero: - provider: aws - config: - region: region-one - profile: "default" - credential: - key: cloud - name: cloud-credentials configuration: nodeAgent: enable: true @@ -18585,7 +18522,7 @@ Below are some samples of DPA configurations for the mentioned platforms - csi customPlugins: - name: hypershift-oadp-plugin - image: quay.io/redhat-user-workloads/ocp-art-tenant/oadp-hypershift-oadp-plugin-main:main + image: quay.io/konveyor/hypershift-oadp-plugin:latest resourceTimeout: 2h ``` @@ -22646,15 +22583,6 @@ spec: key: cloud name: cloud-credentials default: true - snapshotLocations: - - velero: - provider: aws - config: - region: minio - profile: "default" - credential: - key: cloud - name: cloud-credentials configuration: nodeAgent: enable: true @@ -22890,15 +22818,6 @@ spec: credential: key: cloud name: cloud-credentials - snapshotLocations: - - velero: - provider: aws - config: - region: us-east-1 - profile: "volumeSnapshot" - credential: - key: cloud - name: cloud-credentials configuration: nodeAgent: enable: true @@ -23151,15 +23070,6 @@ spec: bucket: example-oadp prefix: backup-objects provider: aws - snapshotLocations: - - velero: - provider: aws - config: - region: region-one - profile: "default" - credential: - key: cloud - name: cloud-credentials configuration: nodeAgent: enable: true @@ -23256,15 +23166,6 @@ spec: credential: key: cloud name: cloud-credentials - snapshotLocations: - - velero: - provider: aws - config: - region: minio - profile: "default" - credential: - key: cloud - name: cloud-credentials configuration: nodeAgent: enable: true diff --git a/test/e2e/v2/backuprestore/README.md b/test/e2e/v2/backuprestore/README.md index 059829d34b45..30073044653f 100644 --- a/test/e2e/v2/backuprestore/README.md +++ b/test/e2e/v2/backuprestore/README.md @@ -18,10 +18,9 @@ The backup and restore tests validate the ability to: 2. **Storage for OADP data**: Might be S3 bucket or other storage 3. **Secret for accessing storage** 4. **Backup Storage Location**: Configured storage location for backups (e.g., S3 bucket for AWS) -5. **Volume Snapshot Location**: Configured snapshot location -6. **DataProtectionApplication**: This resource brings Velero pod that handles the backups -7. **HyperShift CLI**: The `hypershift` binary must be available in your PATH -8. **Platform**: Currently supports AWS platform only +5. **DataProtectionApplication**: This resource brings Velero pod that handles the backups +6. **HyperShift CLI**: The `hypershift` binary must be available in your PATH +7. **Platform**: Supports AWS, Agent, and KubeVirt platforms #### Platform-specific Prerequisites @@ -74,7 +73,7 @@ spec: velero: customPlugins: - name: hypershift-oadp-plugin - image: quay.io/redhat-user-workloads/ocp-art-tenant/oadp-hypershift-oadp-plugin-main:main + image: quay.io/konveyor/hypershift-oadp-plugin:latest defaultPlugins: - openshift - aws @@ -125,29 +124,149 @@ spec: EOF ``` -* VolumeSnapshotLocation +##### Agent and KubeVirt + +Agent and KubeVirt platforms might use MinIO as an S3-compatible object store instead of AWS S3. Both platforms use the same OADP setup. In CI, MinIO runs on the virthost at `192.168.111.1:9000`. + +* MinIO deployment + +Deploy MinIO as a container (adjust credentials and bucket name as needed): ```bash -cluster_name="" -region="" +minio_user="admin" +minio_password="admin123" +bucket_name="oadp-backup" + +mkdir -p /opt/minio/data +podman network create minio-net 2>/dev/null || true +podman run -d --name minio --network minio-net \ + -p 9000:9000 -p 9001:9001 \ + -e MINIO_ROOT_USER=$minio_user \ + -e MINIO_ROOT_PASSWORD=$minio_password \ + -v /opt/minio/data:/data:z \ + quay.io/minio/minio server /data --console-address ":9001" +# Note: The `:z` volume label is required on SELinux-enabled systems (RHEL, Fedora). + +# Create the backup bucket +podman run --rm --network minio-net --entrypoint=/bin/sh quay.io/minio/mc -c "\ + mc alias set myminio http://minio:9000 ${minio_user} ${minio_password} --api s3v4 && \ + mc mb myminio/${bucket_name}" +``` + +The MinIO endpoint accessible from the management cluster depends on your environment. In CI, it is `192.168.111.1` (the virthost IP). When running locally, use the host IP reachable from the cluster. + +* Secret + +Create an AWS-format credentials file for MinIO and apply the secret. The variables must match the values used during MinIO deployment: + +```bash +minio_user="admin" +minio_password="admin123" +bucket_name="oadp-backup" + +cat < /tmp/minio-credentials +[default] +aws_access_key_id = $minio_user +aws_secret_access_key = $minio_password +EOF + +secret_data="$(base64 -w 0 /tmp/minio-credentials)" + +cat <