From ac1ac5451805d9d29e0860af1ca2a747ef2cd27c Mon Sep 17 00:00:00 2001 From: Laura Hinson Date: Tue, 15 Jul 2025 13:58:29 -0400 Subject: [PATCH] Clarifying etcd note about control plane machine sets --- .../disaster_recovery/scenario-2-restoring-cluster-state.adoc | 4 ++++ etcd/etcd-backup-restore/etcd-disaster-recovery.adoc | 4 ++++ modules/dr-restoring-cluster-state.adoc | 2 +- modules/restore-replace-stopped-etcd-member.adoc | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/backup_and_restore/control_plane_backup_and_restore/disaster_recovery/scenario-2-restoring-cluster-state.adoc b/backup_and_restore/control_plane_backup_and_restore/disaster_recovery/scenario-2-restoring-cluster-state.adoc index b148928916..09deb72840 100644 --- a/backup_and_restore/control_plane_backup_and_restore/disaster_recovery/scenario-2-restoring-cluster-state.adoc +++ b/backup_and_restore/control_plane_backup_and_restore/disaster_recovery/scenario-2-restoring-cluster-state.adoc @@ -21,6 +21,10 @@ include::modules/dr-restoring-cluster-state-sno.adoc[leveloffset=+1] // Restoring to a previous cluster state include::modules/dr-restoring-cluster-state.adoc[leveloffset=+1] +[role="_additional-resources"] +.Additional resources +* xref:../../../machine_management/control_plane_machine_management/cpmso-troubleshooting.adoc#cpmso-ts-etcd-degraded_cpmso-troubleshooting[Recovering a degraded etcd Operator] + // Restoring a cluster from etcd backup manually include::modules/manually-restoring-cluster-etcd-backup.adoc[leveloffset=+1] diff --git a/etcd/etcd-backup-restore/etcd-disaster-recovery.adoc b/etcd/etcd-backup-restore/etcd-disaster-recovery.adoc index c8f19bf9d0..9601b4f148 100644 --- a/etcd/etcd-backup-restore/etcd-disaster-recovery.adoc +++ b/etcd/etcd-backup-restore/etcd-disaster-recovery.adoc @@ -58,6 +58,10 @@ include::modules/dr-restoring-cluster-state-sno.adoc[leveloffset=+2] // Restoring to a previous cluster state include::modules/dr-restoring-cluster-state.adoc[leveloffset=+2] +[role="_additional-resources"] +.Additional resources +* xref:../../machine_management/control_plane_machine_management/cpmso-troubleshooting.adoc#cpmso-ts-etcd-degraded_cpmso-troubleshooting[Recovering a degraded etcd Operator] + // Restoring a cluster from etcd backup manually include::modules/manually-restoring-cluster-etcd-backup.adoc[leveloffset=+2] diff --git a/modules/dr-restoring-cluster-state.adoc b/modules/dr-restoring-cluster-state.adoc index 7224449b61..2becb747b1 100644 --- a/modules/dr-restoring-cluster-state.adoc +++ b/modules/dr-restoring-cluster-state.adoc @@ -23,7 +23,7 @@ For high availability (HA) clusters, a three-node HA cluster requires you to shu [NOTE] ==== -If your cluster uses a control plane machine set, see "Troubleshooting the control plane machine set" for a more simple etcd recovery procedure. For {product-title} on a single node, see "Restoring to a previous cluster state for a single node". +If your cluster uses a control plane machine set, see "Recovering a degraded etcd Operator" in "Troubleshooting the control plane machine set" for an etcd recovery procedure. For {product-title} on a single node, see "Restoring to a previous cluster state for a single node". ==== [IMPORTANT] diff --git a/modules/restore-replace-stopped-etcd-member.adoc b/modules/restore-replace-stopped-etcd-member.adoc index 7c2255d6c5..dc1147ee29 100644 --- a/modules/restore-replace-stopped-etcd-member.adoc +++ b/modules/restore-replace-stopped-etcd-member.adoc @@ -11,7 +11,7 @@ This procedure details the steps to replace an etcd member that is unhealthy eit [NOTE] ==== -If your cluster uses a control plane machine set, see "Recovering a degraded etcd Operator" in "Troubleshooting the control plane machine set" for a more simple etcd recovery procedure. +If your cluster uses a control plane machine set, see "Recovering a degraded etcd Operator" in "Troubleshooting the control plane machine set" for an etcd recovery procedure. ==== .Prerequisites