Merge pull request #60004 from lahinson/hcp-book

Author: adellape

_topic_maps/_topic_map.yml

@@ -2201,6 +2201,8 @@ Topics:
   File: hcp-configuring
 - Name: Managing hosted control planes
   File: hcp-managing
+- Name: Backup, restore, and disaster recovery for hosted control planes
+  File: hcp-backup-restore-dr
 ---
 Name: Nodes
 Dir: nodes
@@ -2757,8 +2759,6 @@ Topics:
     File: backing-up-etcd
   - Name: Replacing an unhealthy etcd member
     File: replacing-unhealthy-etcd-member
-  - Name: Backing up and restoring etcd on a hosted cluster
-    File: etcd-backup-restore-hosted-cluster
   - Name: Disaster recovery
     Dir: disaster_recovery
     Topics:
@@ -2768,8 +2768,6 @@ Topics:
       File: scenario-2-restoring-cluster-state
     - Name: Recovering from expired control plane certificates
       File: scenario-3-expired-certs
-    - Name: Disaster recovery for a hosted cluster within an AWS region
-      File: dr-hosted-cluster-within-aws-region
 ---
 Name: Migrating from version 3 to 4
 Dir: migrating_from_ocp_3_to_4

backup_and_restore/control_plane_backup_and_restore/backing-up-etcd.adoc

@@ -21,3 +21,8 @@ After you have an etcd backup, you can xref:../../backup_and_restore/control_pla
 
 // Backing up etcd data
 include::modules/backup-etcd.adoc[leveloffset=+1]
+
+[role="_additional-resources"]
+[id="additional-resources_backup-etcd"]
+== Additional resources
+* xref:../../hosted_control_planes/hcp-backup-restore-dr.adoc#hcp-backup-restore[Backing up and restoring etcd on a hosted cluster]

backup_and_restore/control_plane_backup_and_restore/etcd-backup-restore-hosted-cluster.adoc

@@ -1,11 +1,30 @@
 :_content-type: ASSEMBLY
-[id="dr-hosted-cluster-within-aws-region"]
-= Disaster recovery for a hosted cluster within an AWS region
+[id="hcp-backup-restore-dr"]
+= Backup, restore, and disaster recovery for hosted control planes
 include::_attributes/common-attributes.adoc[]
-:context: dr-hosted-cluster-within-aws-region
+:context: hcp-backup-restore-dr
 
 toc::[]
 
+If you need to back up and restore etcd on a hosted cluster or provide disaster recovery for a hosted cluster, see the following procedures.
+
+:FeatureName: Hosted control planes
+include::snippets/technology-preview.adoc[]
+
+[id="hcp-backup-restore"]
+== Backing up and restoring etcd on a hosted cluster
+
+If you use hosted control planes on {product-title}, the process to back up and restore etcd is different from xref:../backup_and_restore/control_plane_backup_and_restore/backing-up-etcd.adoc#backing-up-etcd-data_backup-etcd[the usual etcd backup process].
+
+// Backing up etcd on a hosted cluster
+include::modules/backup-etcd-hosted-cluster.adoc[leveloffset=+2]
+
+// Restoring an etcd snapshot on a hosted cluster
+include::modules/restoring-etcd-snapshot-hosted-cluster.adoc[leveloffset=+2]
+
+[id="hcp-dr-aws"]
+== Disaster recovery for a hosted cluster within an AWS region
+
 In a situation where you need disaster recovery (DR) for a hosted cluster, you can recover a hosted cluster to the same region within AWS. For example, you need DR when the upgrade of a management cluster fails and the hosted cluster is in a read-only state.
 
 :FeatureName: Hosted control planes
@@ -37,7 +56,7 @@ If you do not include the `--external-dns` flags to maintain the API server URL,
 ====
 
 [id="dr-hosted-cluster-env-context"]
-== Example environment and context
+=== Example environment and context
 
 Consider an scenario where you have three clusters to restore. Two are management clusters, and one is a hosted cluster. You can restore either the control plane only or the control plane and the nodes. Before you begin, you need the following information:
 
@@ -100,7 +119,7 @@ EXTERNAL_DNS_DOMAIN="hc.jpdv.aws.kerbeross.com"
 ----
 
 [id="dr-hosted-cluster-process"]
-== Overview of the backup and restore process
+=== Overview of the backup and restore process
 
 The backup and restore process works as follows:
 
@@ -127,13 +146,14 @@ image::298_OpenShift_Backup_Restore_0123_04.png[]
 You can manually back up and restore your hosted cluster, or you can run a script to complete the process. For more information about the script, see "Running a script to back up and restore a hosted cluster".
 
 // Backing up the hosted cluster
-include::modules/dr-hosted-cluster-within-aws-region-backup.adoc[leveloffset=+1]
+include::modules/dr-hosted-cluster-within-aws-region-backup.adoc[leveloffset=+2]
 
 // Restoring the hosted cluster
-include::modules/dr-hosted-cluster-within-aws-region-restore.adoc[leveloffset=+1]
+include::modules/dr-hosted-cluster-within-aws-region-restore.adoc[leveloffset=+2]
 
 // Deleting the hosted cluster
-include::modules/dr-hosted-cluster-within-aws-region-delete.adoc[leveloffset=+1]
+include::modules/dr-hosted-cluster-within-aws-region-delete.adoc[leveloffset=+2]
 
 //Helper script
-include::modules/dr-hosted-cluster-within-aws-region-script.adoc[leveloffset=+1]
+include::modules/dr-hosted-cluster-within-aws-region-script.adoc[leveloffset=+2]
+

backup_and_restore/control_plane_backup_and_restore/disaster_recovery/dr-hosted-cluster-within-aws-region.adoc renamed to hosted_control_planes/hcp-backup-restore-dr.adoc

@@ -18,8 +18,6 @@ You can view the procedures by selecting from one of the following providers:
 
 * link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.7/html/clusters/cluster_mce_overview#hosting-service-cluster-configure-aws[Configuring the hosted cluster on AWS]: The tasks to configure a hosted cluster on AWS include creating the AWS S3 OIDC secret, creating a routable public zone, enabling external DNS, enabling AWS PrivateLink, enabling the hosted control planes feature, and installing the hosted control planes CLI.
 * link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.7/html/clusters/cluster_mce_overview#hosted-control-planes-manage-aws[Managing hosted control plane clusters on AWS]: Management tasks include creating, importing, accessing, or deleting a hosted cluster on AWS.
-* xref:../backup_and_restore/control_plane_backup_and_restore/etcd-backup-restore-hosted-cluster.adoc#etcd-backup-restore-hosted-cluster[Backing up and restoring etcd on a hosted cluster]: The procedure to back up and restore etcd on a hosted cluster differs from the typical procedure for {product-title}.
-* xref:../backup_and_restore/control_plane_backup_and_restore/disaster_recovery/dr-hosted-cluster-within-aws-region.adoc#dr-hosted-cluster-within-aws-region[Disaster recovery for a hosted cluster within an AWS region]: In a disaster situation, such as when a hosted cluster becomes read-only because of a failure, learn how to restore the hosted cluster.
 
 [id="hcp-configuring-bm"]
 == Bare metal

hosted_control_planes/hcp-configuring.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assembly:
 //
-// * control_plane_backup_and_restore/etcd-backup-restore-hosted-cluster.adoc
+// * hcp-backup-restore-dr.adoc
 
 :_content-type: PROCEDURE
 [id="backup-etcd-hosted-cluster_{context}"]

modules/backup-etcd-hosted-cluster.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assembly:
 //
-// * control_plane_backup_and_restore/dr-hcp-within-aws-region.adoc
+// * hcp-backup-restore-dr.adoc
 
 :_content-type: PROCEDURE
 [id="dr-hosted-cluster-within-aws-region-backup_{context}"]

modules/dr-hosted-cluster-within-aws-region-backup.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assembly:
 //
-// * control_plane_backup_and_restore/dr-hcp-within-aws-region.adoc
+// * hcp-backup-restore-dr.adoc
 
 :_content-type: PROCEDURE
 [id="dr-hosted-cluster-within-aws-region-delete_{context}"]

modules/dr-hosted-cluster-within-aws-region-delete.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assembly:
 //
-// * control_plane_backup_and_restore/dr-hcp-within-aws-region.adoc
+// * hcp-backup-restore-dr.adoc
 
 :_content-type: PROCEDURE
 [id="dr-hosted-cluster-within-aws-region-restore_{context}"]

modules/dr-hosted-cluster-within-aws-region-restore.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assembly:
 //
-// * control_plane_backup_and_restore/dr-hcp-within-aws-region.adoc
+// * hcp-backup-restore-dr.adoc
 
 :_content-type: PROCEDURE
 [id="dr-hosted-cluster-within-aws-region-script_{context}"]