Skip to content

Commit 560198e

Browse files
authored
Merge pull request #35368 from snarayan-redhat/update_ssh_keys_path
Change to sshAuthorizedKeys path
2 parents 3b77a9e + d378d8a commit 560198e

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

modules/troubleshooting-disabling-autoreboot-mco.adoc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ When configuration changes are made by the Machine Config Operator (MCO), {op-sy
1111
====
1212
The following modifications do not trigger a node reboot:
1313
14-
* When the MCO detects any of the following changes, it applies the update without draining or rebooting the node:
14+
* When the MCO detects any of the following changes, it applies the update without draining or rebooting the node:
1515
16-
** Changes to the SSH key in the `spec.config.ignition.passwd.users.sshAuthorizedKeys` parameter of a machine config.
16+
** Changes to the SSH key in the `spec.config.passwd.users.sshAuthorizedKeys` parameter of a machine config.
1717
** Changes to the global pull secret or pull secret in the `openshift-config` namespace.
18-
** Automatic rotation of the `/etc/kubernetes/kubelet-ca.crt` certificate authority (CA) by the Kubernetes API Server Operator.
18+
** Automatic rotation of the `/etc/kubernetes/kubelet-ca.crt` certificate authority (CA) by the Kubernetes API Server Operator.
1919
2020
* When the MCO detects changes to the `/etc/containers/registries.conf` file, such as adding or editing an `ImageContentSourcePolicy` object, it drains the corresponding nodes, applies the changes, and uncordons the nodes.
2121
====
@@ -26,4 +26,3 @@ To avoid unwanted disruptions, you can modify the machine config pool (MCP) to p
2626
====
2727
Pausing a machine config pool stops all system reboot processes and all configuration changes from being applied.
2828
====
29-

modules/understanding-machine-config-operator.adoc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,11 @@ To prevent the nodes from automatically rebooting after machine configuration ch
4747
4848
The following modifications do not trigger a node reboot:
4949
50-
* When the MCO detects any of the following changes, it applies the update without draining or rebooting the node:
50+
* When the MCO detects any of the following changes, it applies the update without draining or rebooting the node:
5151
52-
** Changes to the SSH key in the `spec.config.ignition.passwd.users.sshAuthorizedKeys` parameter of a machine config.
52+
** Changes to the SSH key in the `spec.config.passwd.users.sshAuthorizedKeys` parameter of a machine config.
5353
** Changes to the global pull secret or pull secret in the `openshift-config` namespace.
5454
** Automatic rotation of the `/etc/kubernetes/kubelet-ca.crt` certificate authority (CA) by the Kubernetes API Server Operator.
5555
5656
* When the MCO detects changes to the `/etc/containers/registries.conf` file, such as adding or editing an `ImageContentSourcePolicy` object, it drains the corresponding nodes, applies the changes, and uncordons the nodes.
5757
====
58-

0 commit comments

Comments
 (0)