Merge pull request #79928 from ShreyaSharma-shrsharm/patch-2

Reordering the steps to restart the cluster gracefully

Author: jab-rh

modules/graceful-restart.adoc

@@ -34,10 +34,10 @@ The control plane nodes are ready if the status is `Ready`, as shown in the foll
 +
 [source,terminal]
 ----
-NAME                           STATUS   ROLES    AGE   VERSION
-ip-10-0-168-251.ec2.internal   Ready    master   75m   v1.29.4
-ip-10-0-170-223.ec2.internal   Ready    master   75m   v1.29.4
-ip-10-0-211-16.ec2.internal    Ready    master   75m   v1.29.4
+NAME                           STATUS   ROLES                  AGE   VERSION
+ip-10-0-168-251.ec2.internal   Ready    control-plane,master   75m   v1.29.4
+ip-10-0-170-223.ec2.internal   Ready    control-plane,master   75m   v1.29.4
+ip-10-0-211-16.ec2.internal    Ready    control-plane,master   75m   v1.29.4
 ----
 
 . If the control plane nodes are _not_ ready, then check whether there are any pending certificate signing requests (CSRs) that must be approved.
@@ -105,6 +105,14 @@ $ oc describe csr <csr_name> <1>
 $ oc adm certificate approve <csr_name>
 ----
 
+. After the control plane and worker nodes are ready, mark all the nodes in the cluster as schedulable.
+Run the following command:
++
+[source,terminal]
+----
+for node in $(oc get nodes -o jsonpath='{.items[*].metadata.name}'); do echo ${node} ; oc adm uncordon ${node} ; done
+----
+
 . Verify that the cluster started properly.
 
 .. Check that there are no degraded cluster Operators.
@@ -141,21 +149,13 @@ Check that the status for all nodes is `Ready`.
 +
 [source,terminal]
 ----
-NAME                           STATUS   ROLES    AGE   VERSION
-ip-10-0-168-251.ec2.internal   Ready    master   82m   v1.29.4
-ip-10-0-170-223.ec2.internal   Ready    master   82m   v1.29.4
-ip-10-0-179-95.ec2.internal    Ready    worker   70m   v1.29.4
-ip-10-0-182-134.ec2.internal   Ready    worker   70m   v1.29.4
-ip-10-0-211-16.ec2.internal    Ready    master   82m   v1.29.4
-ip-10-0-250-100.ec2.internal   Ready    worker   69m   v1.29.4
+NAME                           STATUS   ROLES                  AGE   VERSION
+ip-10-0-168-251.ec2.internal   Ready    control-plane,master   82m   v1.29.4
+ip-10-0-170-223.ec2.internal   Ready    control-plane.master   82m   v1.29.4
+ip-10-0-179-95.ec2.internal    Ready    worker                 70m   v1.29.4
+ip-10-0-182-134.ec2.internal   Ready    worker                 70m   v1.29.4
+ip-10-0-211-16.ec2.internal    Ready    control-plane,master   82m   v1.29.4
+ip-10-0-250-100.ec2.internal   Ready    worker                 69m   v1.29.4
 ----
 +
 If the cluster did not start properly, you might need to restore your cluster using an etcd backup.
-
-. After the control plane and worker nodes are ready, mark all the nodes in the cluster as schedulable.
-Run the following command:
-+
-[source,terminal]
-----
-for node in $(oc get nodes -o jsonpath='{.items[*].metadata.name}'); do echo ${node} ; oc adm uncordon ${node} ; done
-----