[OSDOCS-12351]: Removing and redirecting etcd backup/restore content

Author: lahinson

architecture/control-plane.adoc

@@ -70,5 +70,5 @@ ifndef::openshift-dedicated,openshift-rosa[]
 [role="_additional-resources"]
 .Additional resources
 * xref:../scalability_and_performance/recommended-performance-scale-practices/recommended-etcd-practices.adoc#recommended-etcd-practices[Recommended etcd practices]
-* xref:../backup_and_restore/control_plane_backup_and_restore/backing-up-etcd.adoc#backing-up-etcd[Backing up etcd]
+* xref:../etcd/etcd-backup.adoc#backup-etcd_etcd-backup[Backing up and restoring etcd data]
 endif::openshift-dedicated,openshift-rosa[]

backup_and_restore/application_backup_and_restore/oadp-intro.adoc

@@ -13,7 +13,7 @@ toc::[]
 The {oadp-first} product safeguards customer applications on {product-title}. It offers comprehensive disaster recovery protection, covering {product-title} applications, application-related cluster resources, persistent volumes, and internal images. {oadp-short} is also capable of backing up both containerized applications and virtual machines (VMs).
 
 ifndef::openshift-rosa,openshift-rosa-hcp[]
-However, {oadp-short} does not serve as a disaster recovery solution for xref:../../backup_and_restore/control_plane_backup_and_restore/backing-up-etcd.adoc#backup-etcd[etcd] or {OCP-short} Operators.
+However, {oadp-short} does not serve as a disaster recovery solution for xref:../../etcd/etcd-backup.adoc#backing-up-etcd-data_etcd-backup[etcd] or {OCP-short} Operators.
 endif::openshift-rosa,openshift-rosa-hcp[]
 
 [IMPORTANT]
@@ -44,6 +44,6 @@ ifndef::openshift-rosa,openshift-rosa-hcp[]
 [role="_additional-resources"]
 .Additional resources
 
-* xref:../../backup_and_restore/control_plane_backup_and_restore/backing-up-etcd.adoc#backup-etcd[Backing up etcd]
+* xref:../../etcd/etcd-backup.adoc#backing-up-etcd-data_etcd-backup[Backing up etcd data]
 // once finished re-work come back and add doc links to the APIs
 endif::openshift-rosa,openshift-rosa-hcp[]

backup_and_restore/control_plane_backup_and_restore/_attributes

@@ -1 +1 @@
-../../_attributes/
+../_attributes/

backup_and_restore/control_plane_backup_and_restore/disaster_recovery/_attributes

@@ -1 +1 @@
-../../../_attributes/
+../_attributes/

backup_and_restore/control_plane_backup_and_restore/disaster_recovery/scenario-2-restoring-cluster-state.adoc

@@ -32,4 +32,4 @@ include::modules/manually-restoring-cluster-etcd-backup.adoc[leveloffset=+1]
 
 * xref:../../../installing/installing_bare_metal/bare-metal-expanding-the-cluster.adoc#replacing-a-bare-metal-control-plane-node_bare-metal-expanding[Replacing a bare-metal control plane node]
 
-include::modules/dr-scenario-cluster-state-issues.adoc[leveloffset=+1]
+include::modules/dr-scenario-cluster-state-issues.adoc[leveloffset=+1]

backup_and_restore/control_plane_backup_and_restore/disaster_recovery/scenario-3-expired-certs.adoc

@@ -7,4 +7,4 @@ include::_attributes/common-attributes.adoc[]
 toc::[]
 
 // Recovering from expired control plane certificates
-include::modules/dr-recover-expired-control-plane-certs.adoc[leveloffset=+1]
+include::modules/dr-recover-expired-control-plane-certs.adoc[leveloffset=+1]

backup_and_restore/control_plane_backup_and_restore/disaster_recovery/snippets

@@ -1 +1 @@
-../../../snippets/
+../snippets

backup_and_restore/control_plane_backup_and_restore/images

@@ -1 +1 @@
-../../images
+../images

backup_and_restore/control_plane_backup_and_restore/modules

@@ -1 +1 @@
-../../modules
+../modules

backup_and_restore/control_plane_backup_and_restore/replacing-unhealthy-etcd-member.adoc

@@ -54,4 +54,4 @@ include::modules/restore-replace-stopped-baremetal-etcd-member.adoc[leveloffset=
 [role="_additional-resources"]
 [id="additional-resources_replacing-unhealthy-etcd-member"]
 == Additional resources
-* xref:../../machine_management/deleting-machine.adoc#machine-lifecycle-hook-deletion-etcd_deleting-machine[Quorum protection with machine lifecycle hooks]
+* xref:../../machine_management/deleting-machine.adoc#machine-lifecycle-hook-deletion-etcd_deleting-machine[Quorum protection with machine lifecycle hooks]

backup_and_restore/control_plane_backup_and_restore/snippets

@@ -1 +1 @@
-../../snippets/
+../snippets

backup_and_restore/graceful-cluster-restart.adoc

@@ -14,7 +14,7 @@ Even though the cluster is expected to be functional after the restart, the clus
 * Node failure due to hardware
 * Network connectivity issues
 
-If your cluster fails to recover, follow the steps to xref:../backup_and_restore/control_plane_backup_and_restore/disaster_recovery/scenario-2-restoring-cluster-state.adoc#dr-restoring-cluster-state[restore to a previous cluster state].
+If your cluster fails to recover, follow the steps to xref:../etcd/etcd-backup.adoc#dr-scenario-2-restoring-cluster-state-about_etcd-backup[restore to a previous cluster state].
 
 == Prerequisites
 
@@ -26,4 +26,4 @@ include::modules/graceful-restart.adoc[leveloffset=+1]
 [role="_additional-resources"]
 .Additional resources
 
-* See xref:../backup_and_restore/control_plane_backup_and_restore/disaster_recovery/scenario-2-restoring-cluster-state.adoc#dr-restoring-cluster-state[Restoring to a previous cluster state] for how to use an etcd backup to restore if your cluster failed to recover after restarting.
+* See xref:../etcd/etcd-backup.adoc#dr-scenario-2-restoring-cluster-state-about_etcd-backup[Restoring to a previous cluster state] for how to use an etcd backup to restore if your cluster failed to recover after restarting.

backup_and_restore/graceful-cluster-shutdown.adoc

@@ -10,7 +10,7 @@ This document describes the process to gracefully shut down your cluster. You mi
 
 == Prerequisites
 
-* Take an xref:../backup_and_restore/control_plane_backup_and_restore/backing-up-etcd.adoc#backing-up-etcd-data_backup-etcd[etcd backup] prior to shutting down the cluster.
+* Take an xref:../etcd/etcd-backup.adoc#backing-up-etcd-data_etcd-backup[etcd backup] prior to shutting down the cluster.
 +
 [IMPORTANT]
 ====
@@ -22,7 +22,7 @@ For example, the following conditions can cause the restarted cluster to malfunc
 * Node failure due to hardware
 * Network connectivity issues
 
-If your cluster fails to recover, follow the steps to xref:../backup_and_restore/control_plane_backup_and_restore/disaster_recovery/scenario-2-restoring-cluster-state.adoc#dr-restoring-cluster-state[restore to a previous cluster state].
+If your cluster fails to recover, follow the steps to xref:../etcd/etcd-backup.adoc#dr-scenario-2-restoring-cluster-state-about_etcd-backup[restore to a previous cluster state].
 ====
 
 // Shutting down the cluster

backup_and_restore/hibernating-cluster.adoc

@@ -14,7 +14,7 @@ include::modules/hibernating-cluster-about.adoc[leveloffset=+1]
 [id="hibernating-cluster_prerequisites_{context}"]
 == Prerequisites
 
-* Take an xref:../backup_and_restore/control_plane_backup_and_restore/backing-up-etcd.adoc#backing-up-etcd-data_backup-etcd[etcd backup] prior to hibernating the cluster.
+* Take an xref:../etcd/etcd-backup.adoc#backing-up-etcd-data_etcd-backup[etcd backup] prior to hibernating the cluster.
 +
 [IMPORTANT]
 ====
@@ -26,7 +26,7 @@ For example, the following conditions can cause the resumed cluster to malfuncti
 * Node failure due to hardware
 * Network connectivity issues
 
-If your cluster fails to recover, follow the steps to xref:../backup_and_restore/control_plane_backup_and_restore/disaster_recovery/scenario-2-restoring-cluster-state.adoc#dr-restoring-cluster-state[restore to a previous cluster state].
+If your cluster fails to recover, follow the steps to xref:../etcd/etcd-backup.adoc#dr-scenario-2-restoring-cluster-state-about_etcd-backup[restore to a previous cluster state].
 ====
 
 // Hibernating a cluster
@@ -35,7 +35,7 @@ include::modules/hibernating-cluster-hibernate.adoc[leveloffset=+1]
 [role="_additional-resources"]
 .Additional resources
 
-* xref:../backup_and_restore/control_plane_backup_and_restore/backing-up-etcd.adoc#backup-etcd[Backing up etcd]
+* xref:../etcd/etcd-backup.adoc#backup-etcd_etcd-backup[Backing up and restoring etcd data]
 
 // Resuming a hibernated cluster
 include::modules/hibernating-cluster-resume.adoc[leveloffset=+1]

backup_and_restore/index.adoc

@@ -12,25 +12,26 @@ toc::[]
 
 As a cluster administrator, you might need to stop an {product-title} cluster for a period and restart it later. Some reasons for restarting a cluster are that you need to perform maintenance on a cluster or want to reduce resource costs. In {product-title}, you can perform a xref:../backup_and_restore/graceful-cluster-shutdown.adoc#graceful-shutdown-cluster[graceful shutdown of a cluster] so that you can easily restart the cluster later.
 
-You must xref:../backup_and_restore/control_plane_backup_and_restore/backing-up-etcd.adoc#backup-etcd[back up etcd data] before shutting down a cluster; etcd is the key-value store for {product-title}, which persists the state of all resource objects. An etcd backup plays a crucial role in disaster recovery. In {product-title}, you can also xref:../backup_and_restore/control_plane_backup_and_restore/replacing-unhealthy-etcd-member.adoc#replacing-unhealthy-etcd-member[replace an unhealthy etcd member].
+You must xref:../etcd/etcd-backup.adoc#backup-etcd_etcd-backup[back up etcd data] before shutting down a cluster; etcd is the key-value store for {product-title}, which persists the state of all resource objects. An etcd backup plays a crucial role in disaster recovery. In {product-title}, you can also xref:../etcd/etcd-backup.adoc#replace-unhealthy-etcd-member_etcd-backup[replace an unhealthy etcd member].
 
 When you want to get your cluster running again, xref:../backup_and_restore/graceful-cluster-restart.adoc#graceful-restart-cluster[restart the cluster gracefully].
 
 [NOTE]
 ====
-A cluster's certificates expire one year after the installation date. You can shut down a cluster and expect it to restart gracefully while the certificates are still valid. Although the cluster automatically retrieves the expired control plane certificates, you must still xref:../backup_and_restore/control_plane_backup_and_restore/disaster_recovery/scenario-3-expired-certs.adoc#dr-recovering-expired-certs[approve the certificate signing requests (CSRs)].
+A cluster's certificates expire one year after the installation date. You can shut down a cluster and expect it to restart gracefully while the certificates are still valid. Although the cluster automatically retrieves the expired control plane certificates, you must still xref:../etcd/etcd-backup.adoc#dr-scenario-3-recovering-expired-certs_etcd-backup[approve the certificate signing requests (CSRs)].
 ====
 
-You might run into several situations where {product-title}  does not work as expected, such as:
+You might run into several situations where {product-title} does not work as expected, such as:
 
 * You have a cluster that is not functional after the restart because of unexpected conditions, such as node failure or network connectivity issues.
 * You have deleted something critical in the cluster by mistake.
 * You have lost the majority of your control plane hosts, leading to etcd quorum loss.
 
-You can always recover from a disaster situation by xref:../backup_and_restore/control_plane_backup_and_restore/disaster_recovery/scenario-2-restoring-cluster-state.adoc#dr-restoring-cluster-state[restoring your cluster to its previous state] using the saved etcd snapshots.
+You can always recover from a disaster situation by xref:../etcd/etcd-backup.adoc#dr-scenario-2-restoring-cluster-state-about_etcd-backup[restoring your cluster to its previous state] using the saved etcd snapshots.
 
 [role="_additional-resources"]
 .Additional resources
+* xref:../etcd/etcd-backup.adoc#etcd-backup[Backing up and restoring etcd data]
 * xref:../machine_management/deleting-machine.adoc#machine-lifecycle-hook-deletion-etcd_deleting-machine[Quorum protection with machine lifecycle hooks]
 
 [id="application-backup-restore-operations-overview"]

disconnected/updating/disconnected-update.adoc

@@ -20,7 +20,7 @@ Use the following procedures to update a cluster in a disconnected environment w
 * You must provision a local container image registry with the container images for your update, as described in xref:../../disconnected/updating/mirroring-image-repository.adoc#mirroring-ocp-image-repository[Mirroring {product-title} images].
 * You must have access to the cluster as a user with `admin` privileges.
 See xref:../../authentication/using-rbac.adoc#using-rbac[Using RBAC to define and apply permissions].
-* You must have a recent xref:../../backup_and_restore/control_plane_backup_and_restore/backing-up-etcd.adoc#backup-etcd[etcd backup] in case your update fails and you must xref:../../backup_and_restore/control_plane_backup_and_restore/disaster_recovery/scenario-2-restoring-cluster-state.adoc#dr-restoring-cluster-state[restore your cluster to a previous state].
+* You must have a recent xref:../../etcd/etcd-backup.adoc#backing-up-etcd-data_etcd-backup[etcd backup] in case your update fails and you must xref:../../etcd/etcd-backup.adoc#dr-restoring-cluster-state_etcd-backup[restore your cluster to a previous state].
 * You have updated all Operators previously installed through Operator Lifecycle Manager (OLM) to a version that is compatible with your target release. Updating the Operators ensures they have a valid update path when the default OperatorHub catalogs switch from the current minor version to the next during a cluster update. See xref:../../operators/admin/olm-upgrading-operators.adoc#olm-upgrading-operators[Updating installed Operators] for more information on how to check compatibility and, if necessary, update the installed Operators.
 * You must ensure that all machine config pools (MCPs) are running and not paused. Nodes associated with a paused MCP are skipped during the update process. You can pause the MCPs if you are performing a canary rollout update strategy.
 * If your cluster uses manually maintained credentials, update the cloud provider resources for the new release. For more information, including how to determine if this is a requirement for your cluster, see xref:../../updating/preparing_for_updates/preparing-manual-creds-update.adoc#preparing-manual-creds-update[Preparing to update a cluster with manually maintained credentials].

edge_computing/day_2_core_cnf_clusters/updating/telco-update-before-the-update.adoc

@@ -22,6 +22,6 @@ include::modules/creating-single-etcd-backup.adoc[leveloffset=+2]
 [role="_additional-resources"]
 .Additional resources
 
-* xref:../../../backup_and_restore/control_plane_backup_and_restore/backing-up-etcd.adoc#backup-etcd[Backing up etcd]
+* xref:../../../etcd/etcd-backup.adoc#backup-etcd_etcd-backup[Backing up and restoring etcd data]
 
 include::modules/telco-update-checking-the-cluster-health.adoc[leveloffset=+1]

edge_computing/image_based_upgrade/cnf-image-based-upgrade-base.adoc

@@ -34,6 +34,6 @@ include::modules/cnf-image-based-upgrade-rollback.adoc[leveloffset=+1]
 [role="_additional-resources"]
 .Additional resources
 
-* xref:../../backup_and_restore/control_plane_backup_and_restore/disaster_recovery/scenario-3-expired-certs.adoc#dr-scenario-3-recovering-expired-certs_dr-recovering-expired-certs[Recovering from expired control plane certificates]
+* xref:../../etcd/etcd-backup.adoc#dr-scenario-3-recovering-expired-certs_etcd-backup[Recovering from expired control plane certificates]
 
 include::modules/cnf-image-based-upgrade-troubleshooting.adoc[leveloffset=+1]

edge_computing/image_based_upgrade/ztp-image-based-upgrade.adoc

@@ -53,6 +53,6 @@ include::modules/ztp-image-based-upgrade-procedure-rollback.adoc[leveloffset=+1]
 
 * xref:../../edge_computing/image_based_upgrade/ztp-image-based-upgrade.adoc#ztp-image-based-upgrade-supported-combinations_ztp-gitops[Supported action combinations]
 
-* xref:../../backup_and_restore/control_plane_backup_and_restore/disaster_recovery/scenario-3-expired-certs.adoc#dr-scenario-3-recovering-expired-certs_dr-recovering-expired-certs[Recovering from expired control plane certificates]
+* xref:../../etcd/etcd-backup.adoc#dr-scenario-3-recovering-expired-certs_etcd-backup[Recovering from expired control plane certificates]
 
 include::modules/cnf-image-based-upgrade-troubleshooting.adoc[leveloffset=+1]

etcd/etcd-backup.adoc

@@ -121,7 +121,7 @@ include::modules/dr-restoring-etcd-quorum-ha.adoc[leveloffset=+2]
 .Additional resources
 * xref:../installing/installing_bare_metal/upi/installing-bare-metal.adoc[Installing a user-provisioned cluster on bare metal]
 
-//* xref:../installing/installing_bare_metal/ipi/ipi-install-expanding-the-cluster.adoc#replacing-a-bare-metal-control-plane-node_ipi-install-expanding[Replacing a bare-metal control plane node]
+* xref:../installing/installing_bare_metal/bare-metal-expanding-the-cluster.adoc#replacing-a-bare-metal-control-plane-node_bare-metal-expanding[Replacing a bare-metal control plane node]
 
 // Restoring to a previous cluster state
 include::modules/dr-restoring-cluster-state-about.adoc[leveloffset=+2]
@@ -140,7 +140,7 @@ include::modules/manually-restoring-cluster-etcd-backup.adoc[leveloffset=+3]
 * xref:../etcd/etcd-backup.adoc#backing-up-etcd-data_etcd-backup[Backing up etcd data]
 * xref:../installing/installing_bare_metal/upi/installing-bare-metal.adoc[Installing a user-provisioned cluster on bare metal]
 * xref:../networking/accessing-hosts.adoc#accessing-hosts[Accessing hosts on Amazon Web Services in an installer-provisioned infrastructure cluster]
-//* xref:../installing/installing_bare_metal/ipi/ipi-install-expanding-the-cluster.adoc#replacing-a-bare-metal-control-plane-node_ipi-install-expanding[Replacing a bare-metal control plane node]
+* xref:../installing/installing_bare_metal/bare-metal-expanding-the-cluster.adoc#replacing-a-bare-metal-control-plane-node_bare-metal-expanding[Replacing a bare-metal control plane node]
 
 // Issues and workarounds for restoring a persistent storage state
 include::modules/dr-scenario-cluster-state-issues.adoc[leveloffset=+3]

hosted_control_planes/hcp-backup-restore-dr.adoc

@@ -19,7 +19,7 @@ include::modules/hosted-cluster-single-node-recovery.adoc[leveloffset=+2]
 [id="hcp-backup-restore"]
 == Backing up and restoring etcd on a hosted cluster on {aws-short}
 
-If you use {hcp} for {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].
+If you use {hcp} for {product-title}, the process to back up and restore etcd is different from xref:../etcd/etcd-backup.adoc#backup-etcd_etcd-backup[the usual etcd backup process].
 
 The following procedures are specific to {hcp} on {aws-short}.
 

installing/installing_bare_metal/bare-metal-expanding-the-cluster.adoc

@@ -26,9 +26,9 @@ include::modules/ipi-install-replacing-a-bare-metal-control-plane-node.adoc[leve
 [role="_additional-resources"]
 .Additional resources
 
-* xref:../../backup_and_restore/control_plane_backup_and_restore/replacing-unhealthy-etcd-member.adoc#replacing-the-unhealthy-etcd-member[Replacing an unhealthy etcd member]
+* xref:../../etcd/etcd-backup.adoc#replace-unhealthy-etcd-member_etcd-backup[Replacing an unhealthy etcd member]
 
-* xref:../../backup_and_restore/control_plane_backup_and_restore/backing-up-etcd.adoc#backing-up-etcd-data_backup-etcd[Backing up etcd]
+* xref:../../etcd/etcd-backup.adoc#backup-etcd_etcd-backup[Backing up and restoring etcd data]
 
 * xref:../../installing/installing_bare_metal/bare-metal-postinstallation-configuration.adoc#bmo-config-using-bare-metal-operator_bare-metal-postinstallation-configuration[Configuration using the Bare Metal Operator]                                                                      
 

installing/installing_bare_metal/upi/installing-bare-metal.adoc

@@ -150,7 +150,7 @@ include::modules/installation-user-infra-generate-k8s-manifest-ignition.adoc[lev
 [role="_additional-resources"]
 .Additional resources
 
-* See xref:../../../backup_and_restore/control_plane_backup_and_restore/disaster_recovery/scenario-3-expired-certs.adoc#dr-recovering-expired-certs[Recovering from expired control plane certificates] for more information about recovering kubelet certificates.
+* See xref:../../../etcd/etcd-backup.adoc#dr-scenario-3-recovering-expired-certs_etcd-backup[Recovering from expired control plane certificates] for more information about recovering kubelet certificates.
 
 include::modules/creating-machines-bare-metal.adoc[leveloffset=+1]
 

installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc

@@ -142,7 +142,7 @@ include::modules/installation-user-infra-generate-k8s-manifest-ignition.adoc[lev
 [role="_additional-resources"]
 .Additional resources
 
-* See xref:../../../backup_and_restore/control_plane_backup_and_restore/disaster_recovery/scenario-3-expired-certs.adoc#dr-recovering-expired-certs[Recovering from expired control plane certificates] for more information about recovering kubelet certificates.
+* See xref:../../../etcd/etcd-backup.adoc#dr-scenario-3-recovering-expired-certs_etcd-backup[Recovering from expired control plane certificates] for more information about recovering kubelet certificates.
 
 include::modules/installation-special-config-chrony.adoc[leveloffset=+1]