Merge pull request #47393 from apinnick/CNV-19657-clean-up-oadp

CNV-19657: Clean up CNV backup/restore

Author: apinnick

_topic_maps/_topic_map.yml

@@ -3379,14 +3379,8 @@ Topics:
 - Name: Backup and restore
   Dir: backup_restore
   Topics:
-  - Name: Backup and restore overview
+  - Name: Backing up and restoring virtual machines
     File: virt-backup-restore-overview
-  - Name: Installing and configuring OADP
-    File: virt-installing-configuring-oadp
-  - Name: Backing up virtual machines
-    File: virt-backing-up-vms
-  - Name: Restoring virtual machines
-    File: virt-restoring-vms
 #  - Name: Collecting OKD Virtualization data for community report
 #    File: virt-collecting-virt-data
 #    Distros: openshift-origin

modules/oadp-about-backup-snapshot-locations-secrets.adoc

@@ -5,7 +5,6 @@
 // * backup_and_restore/application_backup_and_restore/installing/installing-oadp-gcp.adoc
 // * backup_and_restore/application_backup_and_restore/installing/installing-oadp-mcg.adoc
 // * backup_and_restore/application_backup_and_restore/installing/installing-oadp-ocs.adoc
-// * virt/backup_restore/virt-installing-configuring-oadp.adoc
 
 :_content-type: CONCEPT
 [id="oadp-about-backup-snapshot-locations_{context}"]
@@ -25,12 +24,7 @@ Velero backs up {product-title} resources, Kubernetes objects, and internal imag
 [discrete]
 == Snapshot locations
 
-ifdef::installing-oadp-aws,installing-oadp-azure,installing-oadp-gcp,installing-oadp-mcg,installing-oadp-ocs[]
 If you use your cloud provider's native snapshot API to back up persistent volumes, you must specify the cloud provider as the snapshot location.
-endif::[]
-ifdef::virt-installing-configuring-oadp[]
-If you use your cloud provider's native snapshot API to back up virtual machine disks, you must specify the cloud provider as the snapshot location.
-endif::[]
 
 If you use Container Storage Interface (CSI) snapshots, you do not need to specify a snapshot location because you will create a `VolumeSnapshotClass` CR to register the CSI driver.
 

modules/oadp-creating-default-secret.adoc

@@ -5,7 +5,6 @@
 // * backup_and_restore/application_backup_and_restore/installing/installing-oadp-gcp.adoc
 // * backup_and_restore/application_backup_and_restore/installing/installing-oadp-mcg.adoc
 // * backup_and_restore/application_backup_and_restore/installing/installing-oadp-ocs.adoc
-// * virt/backup_restore/virt-installing-configuring-oadp.adoc
 
 :_content-type: PROCEDURE
 [id="oadp-creating-default-secret_{context}"]
@@ -16,7 +15,7 @@ You create a default `Secret` if your backup and snapshot locations use the same
 ifdef::installing-oadp-aws,installing-oadp-azure,installing-oadp-gcp,installing-oadp-mcg[]
 The default name of the `Secret` is `{credentials}`.
 endif::[]
-ifdef::installing-oadp-ocs,virt-installing-configuring-oadp[]
+ifdef::installing-oadp-ocs[]
 The default name of the `Secret` is `{credentials}`, unless your backup storage provider has a default plug-in, such as `aws`, `azure`, or `gcp`. In that case, the default name is specified in the provider-specific OADP installation procedure.
 endif::[]
 

modules/oadp-creating-restore-cr.adoc

@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * backup_and_restore/application_backup_and_restore/backing_up_and_restoring/restoring-applications.adoc
-// * virt/backup_restore/virt-backing-up-vms.adoc
 
 :_content-type: PROCEDURE
 [id="oadp-creating-restore-cr_{context}"]

modules/oadp-creating-restore-hooks.adoc

@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * backup_and_restore/application_backup_and_restore/backing_up_and_restoring/restoring-applications.adoc
-// * virt/backup_restore/virt-restoring-vms.adoc
 
 :_content-type: PROCEDURE
 [id="oadp-creating-restore-hooks_{context}"]

modules/oadp-enabling-csi-dpa.adoc

@@ -5,7 +5,6 @@
 // * backup_and_restore/application_backup_and_restore/installing/installing-oadp-gcp.adoc
 // * backup_and_restore/application_backup_and_restore/installing/installing-oadp-mcg.adoc
 // * backup_and_restore/application_backup_and_restore/installing/installing-oadp-ocs.adoc
-// * virt/backup_restore/virt-installing-configuring-oadp.adoc
 
 :_content-type: PROCEDURE
 [id="oadp-enabling-csi-dpa_{context}"]

modules/oadp-installing-dpa.adoc

@@ -5,7 +5,6 @@
 // * backup_and_restore/application_backup_and_restore/installing/installing-oadp-gcp.adoc
 // * backup_and_restore/application_backup_and_restore/installing/installing-oadp-mcg.adoc
 // * backup_and_restore/application_backup_and_restore/installing/installing-oadp-ocs.adoc
-// * virt/backup_restore/virt-installing-configuring-oadp.adoc
 
 :_content-type: PROCEDURE
 [id="oadp-installing-dpa_{context}"]
@@ -235,6 +234,7 @@ spec:
   configuration:
     velero:
       defaultPlugins:
+        - kubevirt <.>
         - gcp <.>
         - csi <.>
         - openshift <.>
@@ -251,6 +251,7 @@ spec:
           bucket: <bucket_name> <.>
           prefix: <prefix> <.>
 ----
+<.> Optional: The `kubevirt` plug-in is used with {VirtProductName}.
 <.> Specify the default plug-in for the backup provider, for example, `gcp`, if appropriate.
 <.> Specify the `csi` default plug-in if you use CSI snapshots to back up PVs. The `csi` plug-in uses the link:https://{velero-domain}/docs/main/csi/[Velero CSI beta snapshot APIs]. You do not need to configure a snapshot location.
 <.> The `openshift` plug-in is mandatory.
@@ -260,49 +261,6 @@ spec:
 <.> Specify a bucket as the backup storage location. If the bucket is not a dedicated bucket for Velero backups, you must specify a prefix.
 <.> Specify a prefix for Velero backups, for example, `velero`, if the bucket is used for multiple purposes.
 endif::[]
-ifdef::virt-installing-configuring-oadp[]
-+
-[source,yaml,subs="attributes+"]
-----
-apiVersion: oadp.openshift.io/v1alpha1
-kind: DataProtectionApplication
-metadata:
-  name: <dpa_sample>
-  namespace: openshift-adp
-spec:
-  configuration:
-    velero:
-      defaultPlugins:
-        - kubevirt <.>
-        - gcp <.>
-        - csi <.>
-        - openshift <.>
-    featureFlags:
-    - EnableCSI <.>
-    restic:
-      enable: true <.>
-  backupLocations:
-    - velero:
-        provider: {provider} <.>
-        default: true
-        credential:
-          key: cloud
-          name: <default_secret> <.>
-        objectStorage:
-          bucket: <bucket_name> <.>
-          prefix: <prefix> <.>
-----
-<.> The `kubevirt` plug-in is mandatory for {VirtProductName}.
-<.> Specify the plug-in for the backup provider, for example, `gcp`, if it exists.
-<.> The `csi` plug-in is mandatory for backing up PVs with CSI snapshots. The `csi` plug-in uses the link:https://{velero-domain}/docs/main/csi/[Velero CSI beta snapshot APIs]. You do not need to configure a snapshot location.
-<.> The `openshift` plug-in is mandatory.
-<.> The `EnableCSI` feature flag is mandatory for CSI snapshots.
-<.> Set to `false` if you want to disable the Restic installation. Restic deploys a daemon set, which means that each worker node has `Restic` pods running. You configure Restic for backups by adding `spec.defaultVolumesToRestic: true` to the `Backup` CR.
-<.> Specify the backup provider.
-<.> If you use a default plug-in for the backup provider, you must specify the correct default name for the `Secret`, for example, `cloud-credentials-gcp`. If you specify a custom name, the custom name is used for the backup location. If you do not specify a `Secret` name, the default name is used.
-<.> Specify a bucket as the backup storage location. If the bucket is not a dedicated bucket for Velero backups, you must specify a prefix.
-<.> Specify a prefix for Velero backups, for example, `velero`, if the bucket is used for multiple purposes.
-endif::[]
 
 . Click *Create*.
 . Verify the installation by viewing the OADP resources:

modules/oadp-installing-operator.adoc

@@ -5,7 +5,6 @@
 // * backup_and_restore/application_backup_and_restore/installing/installing-oadp-gcp.adoc
 // * backup_and_restore/application_backup_and_restore/installing/installing-oadp-mcg.adoc
 // * backup_and_restore/application_backup_and_restore/installing/installing-oadp-ocs.adoc
-// * virt/backup_restore/virt-installing-configuring-oadp.adoc
 
 :_content-type: PROCEDURE
 [id="oadp-installing-operator_{context}"]

modules/oadp-secrets-for-different-credentials.adoc

@@ -5,7 +5,6 @@
 // * backup_and_restore/application_backup_and_restore/installing/installing-oadp-gcp.adoc
 // * backup_and_restore/application_backup_and_restore/installing/installing-oadp-mcg.adoc
 // * backup_and_restore/application_backup_and_restore/installing/installing-oadp-ocs.adoc
-// * virt/backup_restore/virt-installing-configuring-oadp.adoc
 
 :_content-type: PROCEDURE
 [id="oadp-secrets-for-different-credentials_{context}"]
@@ -72,7 +71,7 @@ spec:
           profile: "volumeSnapshot"
 ----
 endif::[]
-ifdef::installing-oadp-azure,installing-oadp-gcp,installing-oadp-ocs,installing-oadp-mcg,virt-installing-configuring-oadp[]
+ifdef::installing-oadp-azure,installing-oadp-gcp,installing-oadp-ocs,installing-oadp-mcg[]
 = Creating secrets for different credentials
 
 If your backup and snapshot locations use different credentials, you must create two `Secret` objects:
@@ -198,7 +197,7 @@ spec:
 ----
 <1> Backup location `Secret` with custom name.
 endif::[]
-ifdef::installing-oadp-ocs,virt-installing-configuring-oadp[]
+ifdef::installing-oadp-ocs[]
 +
 [source,yaml,subs="attributes+"]
 ----

modules/oadp-self-signed-certificate.adoc

@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * backup_and_restore/application_backup_and_restore/configuring-oadp.adoc
-// * virt/backup_restore/virt-installing-configuring-oadp.adoc
 
 :_content-type: PROCEDURE
 [id="oadp-self-signed-certificate_{context}"]