Skip to content

Commit 0c95a8a

Browse files
committed
[OCPBUGS-14626]: Removing references to oc login from etcd restore doc
1 parent 2c8867b commit 0c95a8a

File tree

1 file changed

+4
-15
lines changed

1 file changed

+4
-15
lines changed

modules/dr-restoring-cluster-state.adoc

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ When you restore your cluster, you must use an etcd backup that was taken from t
2222

2323
.Prerequisites
2424

25-
* Access to the cluster as a user with the `cluster-admin` role.
25+
* Access to the cluster as a user with the `cluster-admin` role through a certificate-based `kubeconfig` file, like the one that was used during installation.
2626
* A healthy control plane host to use as the recovery host.
2727
* SSH access to control plane hosts.
2828
* A backup directory containing both the etcd snapshot and the resources for the static pods, which were from the same backup. The file names in the directory must be in the following formats: `snapshot_<datetimestamp>.db` and `static_kuberesources_<datetimestamp>.tar.gz`.
@@ -272,16 +272,6 @@ $ sudo crictl ps | grep etcd | egrep -v "operator|etcd-guard"
272272
$ oc -n openshift-etcd get pods -l k8s-app=etcd
273273
----
274274
+
275-
[NOTE]
276-
====
277-
If you attempt to run `oc login` prior to running this command and receive the following error, wait a few moments for the authentication controllers to start and try again.
278-
279-
[source,terminal]
280-
----
281-
Unable to connect to the server: EOF
282-
----
283-
====
284-
+
285275
.Example output
286276
[source,terminal]
287277
----
@@ -558,17 +548,16 @@ $ oc patch etcd/cluster --type=merge -p '{"spec": {"unsupportedConfigOverrides":
558548
+
559549
This command ensures that you can successfully re-create secrets and roll out the static pods.
560550

561-
. In a separate terminal window, log in to the cluster as a user with the `cluster-admin` role by entering the following command:
551+
. In a separate terminal window within the recovery host, export the recovery `kubeconfig` file by running the following command:
562552
+
563553
[source,terminal]
564554
----
565-
$ oc login -u <cluster_admin> <1>
555+
$ export KUBECONFIG=/etc/kubernetes/static-pod-resources/kube-apiserver-certs/secrets/node-kubeconfigs/localhost-recovery.kubeconfig
566556
----
567-
<1> For `<cluster_admin>`, specify a user name with the `cluster-admin` role.
568557

569558
. Force etcd redeployment.
570559
+
571-
In a terminal that has access to the cluster as a `cluster-admin` user, run the following command:
560+
In the same terminal window where you exported the recovery `kubeconfig` file, run the following command:
572561
+
573562
[source,terminal]
574563
----

0 commit comments

Comments
 (0)