Skip to content

Commit b4c1e0e

Browse files
authored
Merge pull request #100961 from mburke5678/mco-idms-drain-documentation-clarification-415
[enterprise-4.15] OCPBUGS 60994 ImageDigestMirrorSet documentation clarifications
2 parents ce6fb20 + 85aa34f commit b4c1e0e

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

modules/images-configuration-registry-mirror.adoc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,18 @@ Each of these custom resource objects identify the following information:
5050
requested from the source repository.
5151
--
5252

53+
Note the following actions and how they affect node drain behavior:
54+
55+
* If you create an IDMS or ICSP CR object, the MCO does not drain or reboot the node.
56+
* If you create an ITMS CR object, the MCO drains and reboots the node.
57+
* If you delete an ITMS, IDMS, or ICSP CR object, the MCO drains and reboots the node.
58+
* If you modify an ITMS, IDMS, or ICSP CR object, the MCO drains and reboots the node.
59+
+
60+
[IMPORTANT]
61+
====
62+
include::snippets/node-icsp-no-drain.adoc[]
63+
====
64+
5365
For new clusters, you can use IDMS, ITMS, and ICSP CRs objects as desired. However, using IDMS and ITMS is recommended.
5466

5567
If you upgraded a cluster, any existing ICSP objects remain stable, and both IDMS and ICSP objects are supported. Workloads using ICSP objects continue to function as expected. However, if you want to take advantage of the fallback policies introduced in the IDMS CRs, you can migrate current workloads to IDMS objects by using the `oc adm migrate icsp` command as shown in the *Converting ImageContentSourcePolicy (ICSP) files for image registry repository mirroring* section that follows. Migrating to IDMS objects does not require a cluster reboot.

snippets/node-icsp-no-drain.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
//
33
// * modules/understanding-machine-config-operator.adoc
44
// * modules/troubleshooting-disabling-autoreboot-mco.adoc
5+
// * modules/images-configuration-registry-mirror.adoc
56

67
:_mod-docs-content-type: SNIPPET
78

8-
The following modifications do not trigger a node reboot:
9-
109
* When the MCO detects any of the following changes, it applies the update without draining or rebooting the node:
1110
1211
** Changes to the SSH key in the `spec.config.passwd.users.sshAuthorizedKeys` parameter of a machine config.
1312
** Changes to the global pull secret or pull secret in the `openshift-config` namespace.
1413
** Automatic rotation of the `/etc/kubernetes/kubelet-ca.crt` certificate authority (CA) by the Kubernetes API Server Operator.
1514

16-
* When the MCO detects changes to the `/etc/containers/registries.conf` file, such as adding or 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:
15+
* 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:
16+
1717
** The addition of a registry with the `pull-from-mirror = "digest-only"` parameter set for each mirror.
1818
** The addition of a mirror with the `pull-from-mirror = "digest-only"` parameter set in a registry.
1919
** The addition of items to the `unqualified-search-registries` list.

0 commit comments

Comments
 (0)