Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions modules/images-configuration-file.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@
You can configure image registry settings by editing the
`image.config.openshift.io/cluster` resource. The
Machine Config Operator (MCO) watches the
`image.config.openshift.io/cluster` for any changes to registries
and reboots the nodes when it detects changes.
`image.config.openshift.io/cluster` resource for any changes to the registries.
When the MCO detects a change, it drains the nodes, applies the change,
and uncordons the nodes.

.Procedure

Expand Down
10 changes: 7 additions & 3 deletions modules/images-configuration-insecure.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,13 @@ status:
registries are allowed. Either `blockedRegistries` or `allowedRegistries` can be set, but not both.
<3> Specify registries that should be permitted for image pull and push actions. All other registries are denied. Either `blockedRegistries` or `allowedRegistries` can be set, but not both.
+
The Machine Config Operator (MCO) watches the `image.config.openshift.io/cluster`
for any changes to registries and reboots the nodes when it detects changes.
Changes to the registries appear in the `/host/etc/containers/registries.conf` file on each node.
The Machine Config Operator (MCO) watches the `image.config.openshift.io/cluster` resource
for any changes to registries. When the MCO detects a change, it drains the nodes, applies the change, reloads the `crio` systemd service on the host, and uncordons the nodes. Changes to the registries appear in the `/etc/containers/registries.conf` file on each node.
+
[NOTE]
====
As of {product-title} 4.7, changes to the registries no longer trigger a reboot.
====
+
[source,terminal]
----
Expand Down
2 changes: 1 addition & 1 deletion modules/images-configuration-parameters.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ registries are allowed.
`allowedRegistries`: Allowlisted for image pull and push actions. All other
registries are blocked.

Only one of `blockedRegistries` or `allowedRegistries` may be set
Only one of `blockedRegistries` or `allowedRegistries` can be set.

|===

Expand Down
6 changes: 4 additions & 2 deletions modules/images-update-global-pull-secret.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ You can update the global pull secret for your cluster.
Cluster resources must adjust to the new pull secret, which can temporarily limit the usability of the cluster.
====

[WARNING]
Updating the global pull secret causes the Machine Config Operator to drain the nodes, apply the change, and uncordon the nodes.

[NOTE]
====
Updating the global pull secret will cause node reboots while the Machine Config Operator (MCO) syncs the changes.
As of {product-title} 4.7, changes to the global pull secret no longer trigger a reboot.
====

.Prerequisites
Expand Down
2 changes: 1 addition & 1 deletion modules/machine-config-overview.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ CRI-O and Kubelet, the kernel, Network Manager and other
system features.
It also offers a MachineConfig CRD that can write configuration files
onto the host (see
link:https://github.com/openshift/machine-config-operator#machine-config-operator[machine-config-operator])
link:https://github.com/openshift/machine-config-operator#machine-config-operator[machine-config-operator]).
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed typo

Understanding what MCO does and how it interacts with other components
is critical to making advanced, system-level changes to an
{product-title} cluster. Here are some things you should know about MCO,
Expand Down
2 changes: 1 addition & 1 deletion modules/nodes-pods-secrets-creating.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ a pod in three ways:

Volume type secrets write data into the container as a file using the volume
mechanism. Image pull secrets use service accounts for the automatic injection of
the secret into all pods in a namespaces.
the secret into all pods in a namespace.
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed typo


When a template contains a secret definition, the only way for the template to
use the provided secret is to ensure that the secret volume sources are
Expand Down
15 changes: 13 additions & 2 deletions modules/troubleshooting-disabling-autoreboot-mco.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,20 @@
// * support/troubleshooting/troubleshooting-operator-issues.adoc

[id="troubleshooting-disabling-autoreboot-mco_{context}"]
= Disabling Machine Config Operator from automatically rebooting
= Disabling Machine Config Operator from automatically rebooting

When configuration changes are made by the Machine Config Operator, {op-system-first} must reboot for the changes to take effect. Whether the configuration change is automatic, such as when a `kube-apiserver-to-kubelet-signer` CA is rotated, or manual, such as when a registry or SSH key is updated, an {op-system} node reboots automatically unless it is paused.
When configuration changes are made by the Machine Config Operator (MCO), {op-system-first} must reboot for the changes to take effect. Whether the configuration change is automatic, such as when a `kube-apiserver-to-kubelet-signer` certificate authority (CA) is rotated, or manual, an {op-system} node reboots automatically unless it is paused.

[NOTE]
====
The following modifications do not trigger a node reboot:

* changes to the SSH key in the `spec.config.ignition.passwd.users.sshAuthorizedKeys` parameter of a machine config
* changes to the global pull secret or pull secret in the `openshift-config` namespace
* changes to the `/etc/containers/registries.conf` file, such as adding or editing an `ImageContentSourcePolicy` object

When the MCO detects any of these changes, it drains the corresponding nodes, applies the changes, and uncordons the nodes.
====

To avoid unwanted disruptions, you can modify the machine config pool to prevent automatic rebooting after the Operator makes changes to the machine config.

Expand Down
10 changes: 9 additions & 1 deletion modules/understanding-machine-config-operator.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,16 @@ When you perform node management operations, you create or modify a

[IMPORTANT]
====
When changes are made to a machine configuration, the Machine Config Operator automatically reboots all corresponding nodes in order for the changes to take effect.
When changes are made to a machine configuration, the Machine Config Operator (MCO) automatically reboots all corresponding nodes in order for the changes to take effect.

To prevent the nodes from automatically rebooting after machine configuration changes, before making the changes, you must pause the autoreboot process by setting the `spec.paused` field to `true` in the corresponding machine config pool. When paused, machine configuration changes are not applied until you set the `spec.paused` field to `false` and the nodes have rebooted into the new configuration.

The following modifications do not trigger a node reboot:

* changes to the SSH key in the `spec.config.ignition.passwd.users.sshAuthorizedKeys` parameter of a machine config
* changes to the global pull secret or pull secret in the `openshift-config` namespace
* changes to the `/etc/containers/registries.conf` file, such as adding or editing an `ImageContentSourcePolicy` object

When the MCO detects any of these changes, it drains the corresponding nodes, applies the changes, and uncordons the nodes.
====