Skip to content
Open
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: 4 additions & 1 deletion machine_configuration/machine-config-node-disruption.adoc
Copy link
Collaborator

Choose a reason for hiding this comment

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

🤖 [error] AsciiDocDITA.ShortDescription: Assign [role="_abstract"] to a paragraph to use it as in DITA.

Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ For example, if you have a policy for the `/etc/` directory and a policy for the

include::snippets/machine-config-node-disruption-actions.adoc[]

include::modules/machine-config-node-disruption-example.adoc[leveloffset=+1]
.Additional resources

* xref:../machine_configuration/index.adoc#about-machine-config-operator_machine-config-overview[About the Machine Config Operator]

include::modules/machine-config-node-disruption-example.adoc[leveloffset=+1]
include::modules/machine-config-node-disruption-config.adoc[leveloffset=+1]
21 changes: 15 additions & 6 deletions modules/images-configuration-registry-mirror.adoc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Module included in the following assemblies:
//
// * openshift_images/image-configuration.adoc
// * updating/updating_a_cluster/updating_disconnected_cluster/disconnected-update.adoc
// * disconnected/updating/disconnected-update.adoc
// * windows_containers/enabling-windows-container-workloads.adoc

ifeval::["{context}" == "enabling-windows-container-workloads"]
Expand Down Expand Up @@ -66,21 +66,30 @@ Note the following actions and how they affect node drain behavior:

* If you create an IDMS or ICSP CR object, the MCO does not drain or reboot the node.
* If you create an ITMS CR object, the MCO drains and reboots the node.
ifndef::winc[]
* If you delete an ITMS, IDMS, or ICSP CR object, the MCO drains and reboots the node.
ifndef::winc,openshift-rosa,openshift-dedicated[]
* If you delete an ITMS, IDMS, or ICSP CR object, the MCO drains and reboots the node, unless you create a node disruption policy to prevent the drain and reboot.
* If you modify an ITMS, IDMS, or ICSP CR object, the MCO drains and reboots the node.
+
[IMPORTANT]
====
include::snippets/node-icsp-no-drain.adoc[]

====
endif::winc[]
endif::winc,openshift-rosa,openshift-dedicated[]
ifdef::winc[]
* If you delete an ITMS or IDMS CR object, the MCO drains and reboots the node.
* If you delete an ITMS or IDMS CR object, the MCO drains and reboots the node, unless you create a node disruption policy to prevent the drain and reboot.
* If you modify an ITMS or IDMS CR object, the MCO drains and reboots the node.
endif::winc[]

ifdef::openshift-rosa,openshift-dedicated[]
* If you delete an ITMS or IDMS CR object, the MCO drains and reboots the node.
* If you modify an ITMS or IDMS CR object, the MCO drains and reboots the node.
+
[IMPORTANT]
====
include::snippets/node-icsp-no-drain.adoc[]
====
endif::openshift-rosa,openshift-dedicated[]

ifndef::winc[]
For new clusters, you can use IDMS, ITMS, and ICSP CRs objects as needed. However, using IDMS and ITMS is recommended.

Expand Down
2 changes: 1 addition & 1 deletion modules/machine-config-node-drain.adoc
Copy link
Collaborator

Choose a reason for hiding this comment

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

🤖 [error] AsciiDocDITA.ShortDescription: Assign [role="_abstract"] to a paragraph to use it as in DITA.

Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ If the MCO drains pods on the master node, note the following conditions:
In certain cases the nodes are not drained. For more information, see "About the Machine Config Operator."
====

There are ways to mitigate the disruption caused by drain and reboot cycles by using node disruption policies or disabling control plane reboots. For more information, see "Understanding node restart behaviors after machine config changes" and "Disabling the Machine Config Operator from automatically rebooting."
There are ways to mitigate the disruption caused by drain and reboot cycles by using node disruption policies or disabling control plane reboots. For more information, see "Using node disruption policies to minimize disruption from machine config changes" and "Disabling the Machine Config Operator from automatically rebooting."
2 changes: 1 addition & 1 deletion modules/machine-config-overview.adoc
Copy link
Collaborator

Choose a reason for hiding this comment

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

🤖 [error] AsciiDocDITA.ShortDescription: Assign [role="_abstract"] to a paragraph to use it as in DITA.

Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,6 @@ Tasks for the MCO configuration that can be done after installation are included

include::snippets/node-icsp-no-drain.adoc[]

In other cases, you can mitigate the disruption to your workload when the MCO makes changes by using _node disruption policies_. For information, see _Understanding node restart behaviors after machine config changes_.
In other cases, you can mitigate the disruption to your workload when the MCO makes changes by using _node disruption policies_. For information, see "Using node disruption policies to minimize disruption from machine config changes".

There might be situations where the configuration on a node does not fully match what the currently-applied machine config specifies. This state is called _configuration drift_. The Machine Config Daemon (MCD) regularly checks the nodes for configuration drift. If the MCD detects configuration drift, the MCO marks the node `degraded` until an administrator corrects the node configuration. A degraded node is online and operational, but, it cannot be updated. For more information on configuration drift, see _Understanding configuration drift detection_.
2 changes: 1 addition & 1 deletion modules/understanding-machine-config-operator.adoc
Copy link
Collaborator

Choose a reason for hiding this comment

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

🤖 [error] AsciiDocDITA.ShortDescription: Assign [role="_abstract"] to a paragraph to use it as in DITA.

Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ When you perform node management operations, you create or modify a
====
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.

You can mitigate the disruption caused by some machine config changes by using a node disruption policy. See _Understanding node restart behaviors after machine config changes_.
You can mitigate the disruption caused by some machine config changes by using a node disruption policy. See "Using node disruption policies to minimize disruption from machine config changes".

Alternatively, you can prevent the nodes from automatically rebooting after machine configuration changes before making the changes. 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.

Expand Down
7 changes: 7 additions & 0 deletions openshift_images/image-configuration.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@ include::modules/images-configuration-cas.adoc[leveloffset=+2]

include::modules/images-configuration-registry-mirror.adoc[leveloffset=+1]

ifndef::openshift-rosa,openshift-dedicated[]
[role="_additional-resources"]
.Additional resources

* xref:../machine_configuration/machine-config-node-disruption.adoc#machine-config-node-disruption[Using node disruption policies to minimize disruption from machine config changes]
endif::openshift-rosa,openshift-dedicated[]

include::modules/images-configuration-registry-mirror-configuring.adoc[leveloffset=+2]

include::modules/images_configuring_registry_mirror_config_params.adoc[leveloffset=+2]
Expand Down
16 changes: 15 additions & 1 deletion snippets/node-icsp-no-drain.adoc
Copy link
Collaborator

Choose a reason for hiding this comment

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

🤖 [error] AsciiDocDITA.ShortDescription: Assign [role="_abstract"] to a paragraph to use it as in DITA.

Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,22 @@
** Changes to the global pull secret or pull secret in the `openshift-config` namespace.
** Automatic rotation of the `/etc/kubernetes/kubelet-ca.crt` certificate authority (CA) by the Kubernetes API Server Operator.

* When the MCO detects changes to the `/etc/containers/registries.conf` file, such as editing an `ImageDigestMirrorSet`, `ImageTagMirrorSet`, or `ImageContentSourcePolicy` object, it drains the corresponding nodes, applies the changes, and uncordons the nodes. The node drain does not happen for the following changes:
ifndef::openshift-rosa,openshift-dedicated[]
* When the MCO detects changes to the `/etc/containers/registries.conf` file, such as editing or deleting an `ImageDigestMirrorSet`, `ImageTagMirrorSet`, or `ImageContentSourcePolicy` object, it drains the corresponding nodes, applies the changes, and uncordons the nodes. The node drain does not happen for the following changes:
+
--
** The addition of a registry with the `pull-from-mirror = "digest-only"` parameter set for each mirror.
** The addition of a mirror with the `pull-from-mirror = "digest-only"` parameter set in a registry.
** The addition of items to the `unqualified-search-registries` list.
--
+
You can create a node disruption policy to prevent the MCO from the draining and rebooting nodes upon the deletion of these objects.
endif::openshift-rosa,openshift-dedicated[]

ifdef::openshift-rosa,openshift-dedicated[]
* When the MCO detects changes to the `/etc/containers/registries.conf` file, such as editing or deleting an `ImageDigestMirrorSet`, `ImageTagMirrorSet`, or `ImageContentSourcePolicy` object, it drains the corresponding nodes, applies the changes, and uncordons the nodes. The node drain does not happen for the following changes:

** The addition of a registry with the `pull-from-mirror = "digest-only"` parameter set for each mirror.
** The addition of a mirror with the `pull-from-mirror = "digest-only"` parameter set in a registry.
** The addition of items to the `unqualified-search-registries` list.
endif::openshift-rosa,openshift-dedicated[]
5 changes: 5 additions & 0 deletions windows_containers/enabling-windows-container-workloads.adoc
Copy link
Collaborator

Choose a reason for hiding this comment

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

🤖 [error] AsciiDocDITA.ShortDescription: Assign [role="_abstract"] to a paragraph to use it as in DITA.

Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ include::modules/wmco-disconnected-cluster.adoc[leveloffset=+1]

include::modules/images-configuration-registry-mirror.adoc[leveloffset=+2]

[role="_additional-resources"]
.Additional resources

* xref:../machine_configuration/machine-config-node-disruption.adoc#machine-config-node-disruption[Using node disruption policies to minimize disruption from machine config changes]

include::modules/images-configuration-registry-mirror-configuring.adoc[leveloffset=+2]

[role="_additional-resources"]
Expand Down