Skip to content

Commit bbc830c

Browse files
authored
Merge pull request #58758 from lahinson/etcd-quorum-not-collapsed-osdocs-5476
[OSDOCS-5476]: Updating etcd restore docs
2 parents 8b0093d + 2c8ac7d commit bbc830c

File tree

3 files changed

+23
-9
lines changed

3 files changed

+23
-9
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,15 @@ include::modules/dr-restoring-cluster-state-about.adoc[leveloffset=+1]
1313

1414
// Restoring to a previous cluster state
1515
include::modules/dr-restoring-cluster-state.adoc[leveloffset=+1]
16-
include::modules/dr-scenario-cluster-state-issues.adoc[leveloffset=+1]
1716

1817
[role="_additional-resources"]
1918
[id="additional-resources_dr-restoring-cluster-state"]
2019
== Additional resources
2120

22-
* xref:../../../networking/accessing-hosts.adoc#accessing-hosts[Creating a bastion host to access {product-title} instances and the control plane nodes with SSH].
21+
* xref:../../../installing/installing_bare_metal/installing-bare-metal.adoc#installing-bare-metal[Installing a user-provisioned cluster on bare metal]
22+
* xref:../../../networking/accessing-hosts.adoc#accessing-hosts[Creating a bastion host to access {product-title} instances and the control plane nodes with SSH]
23+
* 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]
24+
25+
include::modules/dr-scenario-cluster-state-issues.adoc[leveloffset=+1]
26+
2327

24-
* 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].

modules/dr-restoring-cluster-state.adoc

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -372,18 +372,22 @@ $ oc get pods -n openshift-ovn-kubernetes -o name | grep ovnkube-node | while re
372372
$ oc get pods -n openshift-ovn-kubernetes | grep ovnkube-node
373373
----
374374

375-
. Delete and recreate other non-recovery, control plane machines, one by one. After these machines are recreated, a new revision is forced and etcd scales up automatically.
375+
. Delete and re-create other non-recovery, control plane machines, one by one. After the machines are re-created, a new revision is forced and etcd automatically scales up.
376+
+
377+
** If you use a user-provisioned bare metal installation, you can re-create a control plane machine by using the same method that you used to originally create it. For more information, see "Installing a user-provisioned cluster on bare metal".
376378
+
377379
[WARNING]
378380
====
379-
For bare metal installations on installer-provisioned infrastructure, control plane machines are not recreated. For more information, see "Replacing a bare-metal control plane node".
381+
Do not delete and re-create the machine for the recovery host.
380382
====
381383
+
382-
If you are running installer-provisioned infrastructure, or you used the Machine API to create your machines, follow these steps. Otherwise, you must create the new control plane node using the same method that was used to originally create it.
384+
** If you are running installer-provisioned infrastructure, or you used the Machine API to create your machines, follow these steps:
383385
+
384386
[WARNING]
385387
====
386-
Do not delete and recreate the machine for the recovery host.
388+
Do not delete and re-create the machine for the recovery host.
389+
390+
For bare metal installations on installer-provisioned infrastructure, control plane machines are not re-created. For more information, see "Replacing a bare-metal control plane node".
387391
====
388392
.. Obtain the machine for one of the lost control plane hosts.
389393
+
@@ -519,7 +523,7 @@ clustername-8qw5l-worker-us-east-1b-lrdxb Running m4.large us-east-1 us
519523
clustername-8qw5l-worker-us-east-1c-pkg26 Running m4.large us-east-1 us-east-1c 3h28m ip-10-0-170-181.ec2.internal aws:///us-east-1c/i-06861c00007751b0a running
520524
----
521525

522-
.. Create the new machine using the `new-master-machine.yaml` file:
526+
.. Create a machine by using the `new-master-machine.yaml` file:
523527
+
524528
[source,terminal]
525529
----
@@ -551,7 +555,7 @@ It might take a few minutes for the new machine to be created. The etcd cluster
551555

552556
.. Repeat these steps for each lost control plane host that is not the recovery host.
553557

554-
. In a separate terminal window, log in to the cluster as a user with the `cluster-admin` role by using the following command:
558+
. In a separate terminal window, log in to the cluster as a user with the `cluster-admin` role by entering the following command:
555559
+
556560
[source,terminal]
557561
----

post_installation_configuration/cluster-tasks.adoc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -675,6 +675,13 @@ include::modules/disabling-etcd-encryption.adoc[leveloffset=+2]
675675
include::modules/backup-etcd.adoc[leveloffset=+2]
676676
include::modules/etcd-defrag.adoc[leveloffset=+2]
677677
include::modules/dr-restoring-cluster-state.adoc[leveloffset=+2]
678+
679+
[role="_additional-resources"]
680+
.Additional resources
681+
682+
* xref:../installing/installing_bare_metal/installing-bare-metal.adoc#installing-bare-metal[Installing a user-provisioned cluster on bare metal]
683+
* xref:../installing/index.adoc#replacing-a-bare-metal-control-plane-node_ipi-install-expanding[Replacing a bare-metal control plane node]
684+
678685
include::modules/dr-scenario-cluster-state-issues.adoc[leveloffset=+2]
679686

680687
[id="post-install-pod-disruption-budgets"]

0 commit comments

Comments
 (0)