Merge pull request #96300 from openshift-cherrypick-robot/cherry-pick-96184-to-enterprise-4.19

mburke5678 · web-flow · commit 19c5e38119c3 · 2025-07-18T08:11:10.000-04:00
[enterprise-4.19] MCO OCL correct an annotation
diff --git a/modules/coreos-layering-configuring-on-remove.adoc b/modules/coreos-layering-configuring-on-remove.adoc
@@ -10,4 +10,4 @@ To prevent the custom layered images from taking up excessive space in your regi
 
 The credentials provided by the registry push secret that you added to the `MachineOSBuild` object must grant the permission for deleting an image from the registry. If the delete permission is not provided, the image is not removed when you delete the `MachineOSBuild` object.
 
-Note that the custom layered image is not deleted if the image is either currently in use on a node or is desired by the nodes, as indicated by the `machineconfiguration.openshift.io/currentConfig` or `machineconfiguration.openshift.io/desiredConfig` annotation on the node.
+The custom layered image is not deleted if the image is either currently in use on a node or is desired by the nodes, as indicated by the `machineconfiguration.openshift.io/currentImage` or `machineconfiguration.openshift.io/desiredImage` annotations on the node, which are added to the node when you create the `MachineOSConfig` object.

Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,4 @@ To prevent the custom layered images from taking up excessive space in your regi`
`10`	`10`
`11`	`11`	The credentials provided by the registry push secret that you added to the `MachineOSBuild` object must grant the permission for deleting an image from the registry. If the delete permission is not provided, the image is not removed when you delete the `MachineOSBuild` object.
`12`	`12`
`13`		-Note that the custom layered image is not deleted if the image is either currently in use on a node or is desired by the nodes, as indicated by the `machineconfiguration.openshift.io/currentConfig` or `machineconfiguration.openshift.io/desiredConfig` annotation on the node.
	`13`	+The custom layered image is not deleted if the image is either currently in use on a node or is desired by the nodes, as indicated by the `machineconfiguration.openshift.io/currentImage` or `machineconfiguration.openshift.io/desiredImage` annotations on the node, which are added to the node when you create the `MachineOSConfig` object.