Skip to content

Commit e6e2b16

Browse files
authored
Merge pull request #100946 from openshift-cherrypick-robot/cherry-pick-100697-to-enterprise-4.20
[enterprise-4.20] OCPBUGS 60994 ImageDigestMirrorSet documentation clarifications
2 parents d8b22aa + fe8652c commit e6e2b16

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
@@ -65,6 +65,18 @@ Each of these custom resource objects identify the following information:
6565
requested from the source repository.
6666
--
6767

68+
Note the following actions and how they affect node drain behavior:
69+
70+
* If you create an IDMS or ICSP CR object, the MCO does not drain or reboot the node.
71+
* If you create an ITMS CR object, the MCO drains and reboots the node.
72+
* If you delete an ITMS, IDMS, or ICSP CR object, the MCO drains and reboots the node.
73+
* If you modify an ITMS, IDMS, or ICSP CR object, the MCO drains and reboots the node.
74+
+
75+
[IMPORTANT]
76+
====
77+
include::snippets/node-icsp-no-drain.adoc[]
78+
====
79+
6880
ifndef::winc[]
6981
For new clusters, you can use IDMS, ITMS, and ICSP CRs objects as desired. However, using IDMS and ITMS is recommended.
7082

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)