Merge pull request #7787 from stolostron/jcberger-17815-hub-changes-213

https://issues.redhat.com/browse/ACM-17815

Author: jc-berger

business_continuity/backup_restore/backup_arch.adoc

@@ -1,14 +1,20 @@
 [#backup-restore-architecture]
 = Backup and restore operator architecture
 
-The operator defines the `BackupSchedule.cluster.open-cluster-management.io` resource, which is used to set up {acm-short} backup schedules, and the `restore.cluster.open-cluster-management.io` resource, which is used to process and restore these backups. The operator creates corresponding Velero resources, and defines the options needed to back up remote clusters and any other hub cluster resources that need to be restored. View the following diagram:
+The operator defines the `BackupSchedule.cluster.open-cluster-management.io` resource that sets up {acm-short} backup schedules, and the `restore.cluster.open-cluster-management.io` resource. Use these resources to process and restore these backups. The operator creates corresponding Velero resources, and defines the options needed to back up remote clusters and any other hub cluster resources that need to be restored. 
+
+View the following architecture diagram:
 
 image:../images/cluster_backup_controller_dataflow25.png[Backup and restore architecture diagram] 
 
+The backup and restore component provides a set of policies for reporting issues, such as backup pods or backup schedules not running. Use the policy templates to create an alert to the hub cluster administrator if the backup solution does not function. For more information, see _Validating your backup or restore configurations_.
+
+The cluster backup and restore operator depends on the link:https://docs.redhat.com/documentation/en-us/openshift_container_platform/4.16/html/backup_and_restore/oadp-application-backup-and-restore#oadp-release-notes[OADP Operator] to install Velero, and to create a connection from the hub cluster to the backup storage location where the data is stored. Velero is the component that runs the backup and restore operations. The cluster backup and restore operator solution provides backup and restore support for all {acm-short} hub cluster resources, including managed clusters, applications, and policies.
+
 [#backed-up-resources]
 == Resources that are backed up
 
-The cluster backup and restore operator solution provides backup and restore support for all hub cluster resources such as managed clusters, applications, and policies. You can use the solution to back up any third-party resources extending the basic hub cluster installation. With this backup solution, you can define a cron-based backup schedule, which runs at specified time intervals and continuously backs up the latest version of the hub cluster content. 
+The cluster backup and restore operator solution provides backup and restore support for all hub cluster resources such as managed clusters, applications, and policies. Use the solution to back up any third-party resources extending the basic hub cluster installation. With this backup solution, define a cron-based backup schedule, which runs at specified time intervals and continuously backs up the latest version of the hub cluster content.
 
 When the hub cluster needs to be replaced or is in a disaster scenario when the hub cluster fails, a new hub cluster can be deployed and backed up data is moved to the new hub cluster.
 
@@ -131,9 +137,9 @@ Aside from the activation data resources that are identified by using the `clust
 - `clusterclaim.hive.openshift.io`
 - `clustercurator.cluster.open-cluster-management.io`
 
-[#extend-backup-data]
-== Extending backup data
+[#backup-label-function]
+== _Backup_ label function 
 
 You can backup third-party resources with cluster backup and restore by adding the `cluster.open-cluster-management.io/backup` label to the resources. The value of the label can be any string, including an empty string. Use a value that can help you identify the component that you are backing up. For example, use the `cluster.open-cluster-management.io/backup: idp` label if the components are provided by an IDP solution.
 
-*Note:* Use the `cluster-activation` value for the `cluster.open-cluster-management.io/backup` label if you want the resources to be restored when the managed clusters activation resources are restored. When you restore the managed clusters activation resources, the restore starts for the managed clusters that are actively managed by the hub cluster. 
+*Note:* Use the `cluster-activation` value for the `cluster.open-cluster-management.io/backup` label if you want the resources to be restored when the managed clusters activation resources are restored. When you restore the managed clusters activation resources, the restore starts for the managed clusters that are actively managed by the hub cluster.

business_continuity/backup_restore/backup_install.adoc

@@ -49,15 +49,6 @@ To enable the backup operator for your active and passive hub clusters, complete
 .. Create the `DataProtectionApplication` resource on both the active and passive hub cluster. 
 .. For the restore hub cluster, when you create the `DataProtectionApplication` resource, use the same storage location as the backup hub. 
 
-[#running-restore-operation]
-==== Running a restore operation on a hub cluster with a newer version 
-
-If you want to run the restore operation on a hub cluster that uses a newer {acm-short} version than the hub cluster where the backup was created, you can still run a restore operation by completing the following steps:
-
-. On the restore hub cluster, install the operator at the same version as the hub cluster where the backup was created. 
-. Restore the backup data on the restore hub cluster. 
-. On the restore hub cluster, use the upgrade operation to upgrade to the version you want to use. 
-
 [#installing-the-oadp-operator]
 === Installing the OADP operator 
 

business_continuity/backup_restore/backup_intro.adoc

@@ -1,13 +1,9 @@
 [#backup-intro]
 = Backup and restore
 
-The cluster backup and restore operator runs on the hub cluster and provides disaster recovery solutions for {acm} hub cluster failures. When the hub cluster fails, some features, such as policy configuration-based alerting or cluster updates stop working, even if all managed clusters still work. Once the hub cluster is unavailable, you need a recovery plan to decide if recovery is possible, or if the data needs to be recovered on a newly deployed hub cluster.
+The cluster backup and restore operator runs on the hub cluster and provides disaster recovery solutions for {acm} hub cluster failures. When the hub cluster fails, some features, such as policy configuration-based alerting or cluster updates stop working, even if all managed clusters still work. When the hub cluster is unavailable, you need a recovery plan to determine if recovery is possible, or if you need to recover the data on a newly deployed hub cluster.
 
-The backup and restore component provides a set of policies for reporting issues with the backup and restore component, such as backup pods or backup schedules not running. You can use the policy templates to create an alert to the hub cluster administrator if the backup solution is not functioning as expected. For more information, see _Validating your backup or restore configurations_.
-
-The cluster backup and restore operator depends on the link:https://docs.redhat.com/documentation/en-us/openshift_container_platform/4.16/html/backup_and_restore/oadp-application-backup-and-restore#oadp-release-notes[OADP Operator] to install Velero, and to create a connection from the hub cluster to the backup storage location where the data is stored. Velero is the component that runs the backup and restore operations. The cluster backup and restore operator solution provides backup and restore support for all {acm-short} hub cluster resources, including managed clusters, applications, and policies.
-
-The cluster backup and restore operator supports backups of any third-party resources that extend the hub cluster installation. With this backup solution, you can define cron-based backup schedules which run at specified time intervals. When the hub cluster fails, a new hub cluster can be deployed and the backed up data is moved to the new hub cluster.
+The cluster backup and restore operator supports backups of any third-party resources that extend the hub cluster installation. With this backup solution, you can define cron-based backup schedules that run at specified time intervals. When the hub cluster fails, a new hub cluster can be deployed and the backed up data is moved to the new hub cluster.
 
 Continue reading the following topics to learn more about the backup and restore operator:
 

business_continuity/backup_restore/backup_restore.adoc

@@ -10,6 +10,7 @@ To fully restore a backup, complete the following:
 * <<restoring-backup-restore-operation,Using the restore operation for backup types>>
 * <<restoring-data-primary-hub,Restoring data back to the initial primary hub>>
 * <<prepare-new-hub,Preparing the new hub cluster>>
+* <<run-restore-operation,Running a restore operation on a hub cluster with a newer version>>
 * <<clean-hub-restore,Cleaning the hub cluster after restore>>
 * <<restore-passive-resources-check-backups,Restoring passive resources while checking for backups>>
 * <<restore-passive-resources,Restoring passive resources>>
@@ -88,6 +89,15 @@ Use the same configuration as on the initial hub cluster for the `MultiClusterHu
 
 For example, if the initial hub cluster has any other operators installed, such as {aap-short}, {gitops}, `cert-manager`, you have to install them before running the restore operation. This ensures that the new hub cluster is configured in the same way as the initial hub cluster.
 
+[#run-restore-operation]
+== Running a restore operation on a hub cluster with a newer version 
+
+If you want to run the restore operation on a hub cluster that uses a newer {acm-short} version than the hub cluster where the backup was created, you can still run a restore operation by completing the following steps:
+
+. On the restore hub cluster, install the operator at the same version as the hub cluster where the backup was created. 
+. Restore the backup data on the restore hub cluster. 
+. On the restore hub cluster, use the upgrade operation to upgrade to the version you want to use. 
+
 [#clean-hub-restore]
 == Cleaning the hub cluster after restore