Merge pull request #75004 from anarnold97/CNV-35150

CNV#35150: removing OADP from Virt docs

Author: jab-rh

_topic_maps/_topic_map.yml

@@ -4338,14 +4338,8 @@ Topics:
   Topics:
   - Name: Backup and restore by using VM snapshots
     File: virt-backup-restore-snapshots
-  - Name: Installing and configuring OADP
-    File: virt-installing-configuring-oadp
   - Name: Backing up and restoring virtual machines
     File: virt-backup-restore-overview
-  - Name: Backing up virtual machines
-    File: virt-backing-up-vms
-  - Name: Restoring virtual machines
-    File: virt-restoring-vms
   - Name: Disaster recovery
     File: virt-disaster-recovery
 #  - Name: Collecting OKD Virtualization data for community report

_topic_maps/_topic_map_osd.yml

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

_topic_maps/_topic_map_rosa.yml

@@ -1960,14 +1960,8 @@ Topics:
   Topics:
   - Name: Backup and restore by using VM snapshots
     File: virt-backup-restore-snapshots
-  - Name: Installing and configuring OADP
-    File: virt-installing-configuring-oadp
-  - Name: Backing up and restoring virtual machines
-    File: virt-backup-restore-overview
-  - Name: Backing up virtual machines
-    File: virt-backing-up-vms
-  - Name: Restoring virtual machines
-    File: virt-restoring-vms
+#  - Name: Backing up and restoring virtual machines
+#    File: virt-backup-restore-overview
 #  - Name: Removed topics (Placeholder for topics removed from topic map)
 #    Dir: Removed_topics
 #    Topics:

modules/install-and-configure-oadp-kubevirt.adoc

@@ -8,7 +8,7 @@
 
 As a cluster administrator, you install {oadp-short} by installing the {oadp-short} Operator.
 
-The Operator installs link:https://velero.io/docs/v{velero-version}[Velero {velero-version}].
+The latest version of the {oadp-short} Operator installs link:https://velero.io/docs/v{velero-version}[Velero {velero-version}].
 
 .Prerequisites
 

modules/oadp-installing-dpa-1-2-and-earlier.adoc

@@ -18,7 +18,7 @@ You install the Data Protection Application (DPA) by creating an instance of the
 * You must configure object storage as a backup location.
 * If you use snapshots to back up PVs, your cloud provider must support either a native snapshot API or Container Storage Interface (CSI) snapshots.
 * If the backup and snapshot locations use the same credentials, you must create a `Secret` with the default name, `{credentials}`.
-ifdef::installing-oadp-azure,installing-oadp-gcp,installing-oadp-mcg,installing-oadp-ocs,virt-installing-configuring-oadp[]
+ifdef::installing-oadp-azure,installing-oadp-gcp,installing-oadp-mcg,installing-oadp-ocs[]
 * If the backup and snapshot locations use different credentials, you must create two `Secrets`:
 
 ** `Secret` with a custom name for the backup location. You add this `Secret` to the `DataProtectionApplication` CR.
@@ -299,51 +299,6 @@ spec:
 <10> Specify a bucket as the backup storage location. If the bucket is not a dedicated bucket for Velero backups, you must specify a prefix.
 <11> 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 <1>
-        - gcp <2>
-        - csi <3>
-        - openshift <4>
-      resourceTimeout: 10m <5>
-    restic:
-      enable: true <6>
-      podConfig:
-        nodeSelector: <node_selector> <7>
-  backupLocations:
-    - velero:
-        provider: {provider} <8>
-        default: true
-        credential:
-          key: cloud
-          name: <default_secret> <9>
-        objectStorage:
-          bucket: <bucket_name> <10>
-          prefix: <prefix> <11>
-----
-<1> The `kubevirt` plugin is mandatory for {VirtProductName}.
-<2> Specify the plugin for the backup provider, for example, `gcp`, if it exists.
-<3> The `csi` plugin is mandatory for backing up PVs with CSI snapshots. The `csi` plugin uses the link:https://{velero-domain}/docs/main/csi/[Velero CSI beta snapshot APIs]. You do not need to configure a snapshot location.
-<4> The `openshift` plugin is mandatory.
-<5> Specify how many minutes to wait for several Velero resources before timeout occurs, such as Velero CRD availability, volumeSnapshot deletion, and backup repository availability. The default is 10m.
-<6> Set this value to `false` if you want to disable the Restic installation. Restic deploys a daemon set, which means that Restic pods run on each working node. In OADP version 1.2 and later, you can configure Restic for backups by adding `spec.defaultVolumesToFsBackup: true` to the `Backup` CR. In OADP version 1.1, add `spec.defaultVolumesToRestic: true` to the `Backup` CR.
-<7> Specify on which nodes Restic is available. By default, Restic runs on all nodes.
-<8> Specify the backup provider.
-<9> Specify the correct default name for the `Secret`, for example, `cloud-credentials-gcp`, if you use a default plugin for the backup provider. If specifying a custom name, then the custom name is used for the backup location. If you do not specify a `Secret` name, the default name is used.
-<10> Specify a bucket as the backup storage location. If the bucket is not a dedicated bucket for Velero backups, you must specify a prefix.
-<11> Specify a prefix for Velero backups, for example, `velero`, if the bucket is used for multiple purposes.
-endif::[]
 
 . Click *Create*.
 

modules/oadp-installing-dpa-1-3.adoc

@@ -6,6 +6,7 @@
 // * backup_and_restore/application_backup_and_restore/installing/installing-oadp-mcg.adoc
 // * backup_and_restore/application_backup_and_restore/installing/installing-oadp-ocs.adoc
 // * backup_and_restore/application_backup_and_restore/installing/installing-oadp-kubevirt.adoc
+// * virt/backup_restore/virt-backup-restore-overview.adoc
 
 :_mod-docs-content-type: PROCEDURE
 [id="oadp-installing-dpa-1-3_{context}"]
@@ -19,7 +20,7 @@ You install the Data Protection Application (DPA) by creating an instance of the
 * You must configure object storage as a backup location.
 * If you use snapshots to back up PVs, your cloud provider must support either a native snapshot API or Container Storage Interface (CSI) snapshots.
 * If the backup and snapshot locations use the same credentials, you must create a `Secret` with the default name, `{credentials}`.
-ifdef::installing-oadp-azure,installing-oadp-gcp,installing-oadp-mcg,installing-oadp-ocs,virt-installing-configuring-oadp[]
+ifdef::installing-oadp-azure,installing-oadp-gcp,installing-oadp-mcg,installing-oadp-ocs[]
 * If the backup and snapshot locations use different credentials, you must create two `Secrets`:
 
 ** `Secret` with a custom name for the backup location. You add this `Secret` to the `DataProtectionApplication` CR.
@@ -321,7 +322,7 @@ spec:
 <14> Specify a prefix for Velero backups, for example, `velero`, if the bucket is used for multiple purposes.
 endif::[]
 
-ifdef::installing-oadp-kubevirt,virt-installing-configuring-oadp[]
+ifdef::virt-backup-restore-overview,installing-oadp-kubevirt[]
 +
 [source,yaml,subs="attributes+"]
 ----

modules/oadp-setting-resource-limits-and-requests.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
 // * backup_and_restore/application_backup_and_restore/oadp-aws-sts/oadp-aws-sts.adoc
 // * backup_and_restore/application_backup_and_restore/installing/installing-oadp-aws.adoc
 // * backup_and_restore/application_backup_and_restore/installing/installing-oadp-azure.adoc

virt/backup_restore/virt-backing-up-vms.adoc

@@ -3,45 +3,54 @@ include::_attributes/common-attributes.adoc[]
 [id="virt-backup-restore-overview"]
 = Backing up and restoring virtual machines
 :context: virt-backup-restore-overview
+:virt-backup-restore-overview:
+:credentials: cloud-credentials
+:provider: gcp
 
 toc::[]
 
-//Hiding all links until PR 68901 merges
-ifndef::openshift-rosa,openshift-dedicated[]
-Back up and restore virtual machines by using the xref:../../backup_and_restore/index.adoc#application-backup-restore-operations-overview[OpenShift API for Data Protection (OADP)].
+You can install the {oadp-first} with {VirtProductName} by installing the {oadp-short} Operator and configuring a backup location. Then, you can install the Data Protection Application.
 
-.Prerequisites
+Back up and restore virtual machines by using the xref:../../backup_and_restore/index.adoc#application-backup-restore-operations-overview[{oadp-full}].
 
-* Access to the cluster as a user with the `cluster-admin` role.
-// Non-admin user [https://issues.redhat.com/browse/OADP-203] is targeted for OADP 1.2.
+[NOTE]
+====
+{oadp-full} with {VirtProductName} supports the following backup and restore storage options:
 
-.Procedure
+* Container Storage Interface (CSI) backups
 
-. Install the xref:../../backup_and_restore/application_backup_and_restore/installing/about-installing-oadp.adoc#about-installing-oadp[OADP Operator] according to the instructions for your storage provider.
-. Install the xref:../../backup_and_restore/application_backup_and_restore/installing/installing-oadp-ocs.adoc#oadp-installing-dpa_installing-oadp-ocs[Data Protection Application] with the `kubevirt` and `openshift` xref:../../backup_and_restore/application_backup_and_restore/oadp-features-plugins.adoc#oadp-plugins_oadp-features-plugins[plugins].
-. Back up virtual machines by creating a xref:../../backup_and_restore/application_backup_and_restore/backing_up_and_restoring/backing-up-applications.adoc#backing-up-applications[`Backup` custom resource (CR)].
-. Restore the `Backup` CR by creating a xref:../../backup_and_restore/application_backup_and_restore/backing_up_and_restoring/restoring-applications.adoc#restoring-applications[`Restore` CR].
+* Container Storage Interface (CSI) backups with DataMover
+
+The following storage options are excluded:
+
+* File system backup and restore
+
+* Volume snapshot backup and restore
+
+For more information, see xref:../../backup_and_restore/application_backup_and_restore/backing_up_and_restoring/oadp-backing-up-applications-restic-doc.adoc#oadp-backing-up-applications-restic-doc[Backing up applications with File System Backup: Kopia or Restic].
+====
+To install the {oadp-short} Operator in a restricted network environment, you must first disable the default OperatorHub sources and mirror the Operator catalog. See xref:../../operators/admin/olm-restricted-networks.adoc#olm-restricted-networks[Using Operator Lifecycle Manager on restricted networks] for details.
+
+include::modules/install-and-configure-oadp-kubevirt.adoc[leveloffset=+1]
 
 [role="_additional-resources"]
-[id="additional-resources_virt-backup-restore-overview"]
-== Additional resources
+.Additional resources
 
-* xref:../../backup_and_restore/application_backup_and_restore/oadp-features-plugins.adoc#oadp-features-plugins[OADP features and plugins]
-* xref:../../backup_and_restore/application_backup_and_restore/troubleshooting.adoc#troubleshooting[Troubleshooting]
-endif::openshift-rosa,openshift-dedicated[]
+* xref:../../backup_and_restore/application_backup_and_restore/oadp-features-plugins.adoc#oadp-plugins_oadp-features-plugins[{oadp-short} plugins]
+* xref:../../backup_and_restore/application_backup_and_restore/backing_up_and_restoring/backing-up-applications.adoc#backing-up-applications[`Backup` custom resource (CR)]
+* xref:../../backup_and_restore/application_backup_and_restore/backing_up_and_restoring/restoring-applications.adoc#restoring-applications[`Restore` CR]
+* xref:../../operators/admin/olm-restricted-networks.adoc#olm-restricted-networks[Using Operator Lifecycle Manager on restricted networks]
 
-ifdef::openshift-rosa,openshift-dedicated[]
-Back up and restore virtual machines by using the OpenShift API for Data Protection (OADP).
+include::modules/oadp-installing-dpa-1-3.adoc[leveloffset=+1]
 
-.Prerequisites
+[IMPORTANT]
+====
+Red Hat supports using {VirtProductName} 4.14 or later with {oadp-short} 1.3.x or later.
 
-* Access to the cluster as a user with the `cluster-admin` role.
-// Non-admin user [https://issues.redhat.com/browse/OADP-203] is targeted for OADP 1.2.
+{oadp-short} versions before 1.3.0 are not supported for back up and restore of {VirtProductName}.
+====
 
-.Procedure
+:!provider:
+:!credentials:
+:!virt-backup-restore-overview:
 
-. Install the OADP Operator according to the instructions for your storage provider.
-. Install the Data Protection Application with the `kubevirt` and `openshift` plugins.
-. Back up virtual machines by creating a `Backup` custom resource (CR).
-. Restore the `Backup` CR by creating a `Restore` CR.
-endif::openshift-rosa,openshift-dedicated[]