update desired image removal on ocl disable

Author: isabella-janssen

pkg/controller/common/layered_node_state.go

@@ -141,7 +141,6 @@ func (l *LayeredNodeState) SetDesiredStateFromPool(mcp *mcfgv1.MachineConfigPool
 	node := l.Node()
 
 	metav1.SetMetaDataAnnotation(&node.ObjectMeta, daemonconsts.DesiredMachineConfigAnnotationKey, mcp.Spec.Configuration.Name)
-	// todo: check if a new desired config actually deletes an image anno
 	delete(node.Annotations, daemonconsts.DesiredImageAnnotationKey)
 
 	l.node = node
@@ -321,16 +320,6 @@ func (l *LayeredNodeState) CheckNodeCandidacyForUpdate(layered bool, pool *mcfgv
 	return true
 }
 
-// Returns the desired config version annotation present on the node.
-func (l *LayeredNodeState) GetDesiredConfigAnnotation() string {
-	return l.node.Annotations[daemonconsts.DesiredMachineConfigAnnotationKey]
-}
-
-// Returns the desired image annotation present on the node.
-func (l *LayeredNodeState) GetDesiredImageAnnotation() string {
-	return l.node.Annotations[daemonconsts.DesiredImageAnnotationKey]
-}
-
 // GetDesiredAnnotationsFromMachineOSConfig gets the desired config version and desired image values from the associated MOSC and MOSB
 func (l *LayeredNodeState) GetDesiredAnnotationsFromMachineConfigPool(mcp *mcfgv1.MachineConfigPool) (desriedConfig string) {
 	return mcp.Spec.Configuration.Name

pkg/controller/node/node_controller.go

@@ -1289,12 +1289,13 @@ func (ctrl *Controller) updateCandidateNode(mosc *mcfgv1.MachineOSConfig, mosb *
 		}
 
 		lns := ctrlcommon.NewLayeredNodeState(oldNode)
-		desiredConfig := lns.GetDesiredConfigAnnotation()
-		desiredImage := lns.GetDesiredImageAnnotation()
+		desiredConfig := ""
+		desiredImage := ""
 		if !layered {
 			// TODO: see if this can be consolidated
 			lns.SetDesiredStateFromPool(pool)
-			// TODO: see what's up with the desired image annotation in this case...
+			// If pool is not layered, the desired image annotation is removed (see the `delete`
+			// call in `SetDesiredStateFromPool`), so only the desired config version must be set.
 			desiredConfig = lns.GetDesiredAnnotationsFromMachineConfigPool(pool)
 		} else {
 			// TODO: see if this can be consolidated