Merge pull request #60789 from dfitzmau/OSDOCS-5020

Author: adellape

modules/dr-restoring-cluster-state.adoc

@@ -12,7 +12,7 @@ You can use a saved etcd backup to restore a previous cluster state or restore a
 
 [NOTE]
 ====
-If your cluster uses a control plane machine set, see "Troubleshooting the control plane machine set" for a more simple etcd recovery procedure. 
+If your cluster uses a control plane machine set, see "Troubleshooting the control plane machine set" for a more simple etcd recovery procedure.
 ====
 
 [IMPORTANT]
@@ -290,7 +290,8 @@ etcd-ip-10-0-143-125.ec2.internal                1/1     Running     1
 ----
 +
 If the status is `Pending`, or the output lists more than one running etcd pod, wait a few minutes and check again.
-
++
+.. Optional: For each lost control plane host, repeat the steps for verifying that the single member control plane has started successfully.
 +
 [NOTE]
 ====
@@ -304,6 +305,8 @@ Perform the following step only if you are using `OVNKubernetes` network plugin.
 $ oc delete node <non-recovery-controlplane-host-1> <non-recovery-controlplane-host-2>
 ----
 
+. Optional: For any remaining non-recovery control plane nodes, delete and recreate each non-recovery control plane node.
+
 . Verify that the Cluster Network Operator (CNO) redeploys the OVN-Kubernetes control plane and that it no longer references the wrong controller IP addresses. To verify this result, regularly check the output of the following command. Wait until it returns an empty result before you proceed with the next step.
 +
 [source,terminal]
@@ -379,7 +382,7 @@ $ oc get  pods -n openshift-ovn-kubernetes | grep ovnkube-node
 
 . 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.
 +
-** 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". 
+** 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".
 +
 [WARNING]
 ====
@@ -712,4 +715,21 @@ etcd-ip-10-0-173-171.ec2.internal                2/2     Running     0
 
 To ensure that all workloads return to normal operation following a recovery procedure, restart each pod that stores Kubernetes API information. This includes {product-title} components such as routers, Operators, and third-party components.
 
-Note that it might take several minutes after completing this procedure for all services to be restored. For example, authentication by using `oc login` might not immediately work until the OAuth server pods are restarted.
+[NOTE]
+====
+On completion of the previous procedural steps, you might need to wait a few minutes for all services to return to their restored state. For example, authentication by using `oc login` might not immediately work until the OAuth server pods are restarted.
+
+Consider using the `system:admin` `kubeconfig` file for immediate authentication. This method basis its authentication on SSL/TLS client certificates as against OAuth tokens. You can authenticate with this file by issuing the following command:
+
+[source,terminal]
+----
+$ export KUBECONFIG=<installation_directory>/auth/kubeconfig
+----
+
+Issue the following command to display your authenticated user name:
+
+[source,terminal]
+----
+$ oc whoami
+----
+====