Merge pull request #1907 from benluddy/staticpod-node-controller-no-installer-field-stomping

OCPBUGS-46372: Prevent node controller from stomping NodeStatus fields owned by installer controller

Author: openshift-merge-bot[bot]

pkg/operator/staticpod/controller/node/node_controller.go

@@ -96,18 +96,7 @@ func (c *NodeController) sync(ctx context.Context, syncCtx factory.SyncContext)
 			}
 		}
 		if found {
-			newTargetNodeState := applyoperatorv1.NodeStatus().
-				WithNodeName(originalOperatorStatus.NodeStatuses[i].NodeName).
-				WithCurrentRevision(originalOperatorStatus.NodeStatuses[i].CurrentRevision).
-				WithTargetRevision(originalOperatorStatus.NodeStatuses[i].TargetRevision).
-				WithLastFailedRevision(originalOperatorStatus.NodeStatuses[i].LastFailedRevision).
-				WithLastFailedReason(originalOperatorStatus.NodeStatuses[i].LastFailedReason).
-				WithLastFailedCount(originalOperatorStatus.NodeStatuses[i].LastFailedCount).
-				WithLastFallbackCount(originalOperatorStatus.NodeStatuses[i].LastFallbackCount).
-				WithLastFailedRevisionErrors(originalOperatorStatus.NodeStatuses[i].LastFailedRevisionErrors...)
-			if originalOperatorStatus.NodeStatuses[i].LastFailedTime != nil {
-				newTargetNodeState = newTargetNodeState.WithLastFailedTime(*originalOperatorStatus.NodeStatuses[i].LastFailedTime)
-			}
+			newTargetNodeState := applyoperatorv1.NodeStatus().WithNodeName(originalOperatorStatus.NodeStatuses[i].NodeName)
 			newTargetNodeStates = append(newTargetNodeStates, newTargetNodeState)
 		} else {
 			syncCtx.Recorder().Warningf("MasterNodeRemoved", "Observed removal of master node %s", nodeState.NodeName)