Merge pull request #105790 from openshift-cherrypick-robot/cherry-pick-100815-to-enterprise-4.21

[enterprise-4.21] OCDOCS 62865 provide meaningful examples for NDP

modules/machine-config-node-disruption-config.adoc

@@ -6,6 +6,7 @@
 [id="machine-config-node-disruption-config_{context}"]
 = Configuring node restart behaviors upon machine config changes
 
+[role="_abstract"]
 You can create a node disruption policy to define the machine configuration changes that cause a disruption to your cluster, and which changes do not.
 
 You can control how your nodes respond to changes in the files in the `/var` or `/etc` directory, the systemd units, the SSH keys, and the `registries.conf` file.
@@ -58,7 +59,7 @@ spec:
       - restart:
           serviceName: crio.service
         type: Restart
-      name: test.service
+      name: sshd.service
 ----
 <1> Specifies the node disruption policy.
 <2> Specifies a list of machine config file definitions and actions to take to changes on those paths. This list supports a maximum of 50 entries.
@@ -117,7 +118,7 @@ status:
         - restart:
             serviceName: crio.service
           type: Restart
-        name: test.se
+        name: sshd.service
 # ...
 ----
 <1> Specifies the current cluster-validated policies.

modules/machine-config-node-disruption-example.adoc

@@ -2,11 +2,12 @@
 //
 // * machine_configuration/machine-config-node-disruption_machine-configs-configure.adoc
 
-:_mod-docs-content-type: PROCEDURE
+:_mod-docs-content-type: REFERENCE
 [id="machine-config-node-disruption-example_{context}"]
 = Example node disruption policies
 
-The following example `MachineConfiguration` objects contain a node disruption policy.
+[role="_abstract"]
+You can use the following example `MachineConfiguration` objects to help you create a node disruption policy that can help reduce disruption to the workloads in your cluster.
 
 [TIP]
 ====
@@ -73,7 +74,27 @@ status:
 
 The default node disruption policy does not contain a policy for changes to the `/etc/containers/registries.conf.d` file. This is because both {product-title} and {op-system-base-full} use the `registries.conf.d` file to specify aliases for image short names. It is recommended that you always pull an image by its fully-qualified name. This is particularly important with public registries, because the image might not deploy if the public registry requires authentication. You can create a user-defined policy to use with the `/etc/containers/registries.conf.d` file, if you need to use image short names.
 
-In the following example, when changes are made to the SSH keys, the MCO drains the cluster nodes, reloads the `crio.service`, reloads the systemd configuration, and restarts the `crio-service`.
+In the following example, when changes are made to the `registries.conf.d` file, the MCO restarts the `crio-service`.
+
+.Example node disruption policy for a change to the `registries.conf.d` file
+[source,yaml]
+----
+apiVersion: operator.openshift.io/v1
+kind: MachineConfiguration
+metadata:
+  name: cluster
+  namespace: openshift-machine-config-operator
+spec:
+  nodeDisruptionPolicy:
+    files:
+      - path: /etc/containers/registries.conf.d
+        actions:
+          - type: Restart
+            restart:
+              serviceName: crio.service 
+----
+
+In the following example, when changes are made to the SSH keys, the MCO reloads the systemd manager configuration, and restarts the `crio-service`.
 
 .Example node disruption policy for an SSH key change
 [source,yaml]
@@ -87,14 +108,11 @@ spec:
   nodeDisruptionPolicy:
     sshkey:
       actions:
-      - type: Drain
-      - reload:
-          serviceName: crio.service
-        type: Reload
       - type: DaemonReload
-      - restart:
-          serviceName: crio.service
-        type: Restart
+      - type: Restart
+          restart:
+            serviceName: crio.service
+ 
 # ...
 ----
 
@@ -145,21 +163,3 @@ spec:
             restart:
               serviceName: crio.service
 ----
-
-In the following example, when changes are made to the `registries.conf` file, such as by editing an `ImageContentSourcePolicy` (ICSP) object, the MCO does not drain or reboot the nodes and applies the changes with no further action.
-
-.Example node disruption policy for a registries.conf file change
-[source,yaml]
-----
-apiVersion: operator.openshift.io/v1
-kind: MachineConfiguration
-metadata:
-  name: cluster
-# ...
-spec:
-  nodeDisruptionPolicy:
-    files:  
-      - actions:
-        - type: None
-        path: /etc/containers/registries.conf
-----

snippets/machine-config-node-disruption-actions.adoc

@@ -13,7 +13,7 @@ When you make any of these changes, the node disruption policy determines which
 * *Reload*: For services, the MCO reloads the specified services without restarting the service.
 * *Restart*: For services, the MCO fully restarts the specified services.
 * *DaemonReload*: The MCO reloads the systemd manager configuration.
-* *Special*: This is an internal MCO-only action and cannot be set by the user.
+* *Special*: This is an internal MCO-only action that is set by default for changes to the `/etc/containers/registries.conf` file. When this action is set, the MCO determines if a node cordon and drain is required, based on the changed content in the `registries.conf` file. You can override this setting. However, this is not recommended. You cannot set this action for another path or service.
 
 [NOTE]
 ====