cleanup

Author: isabella-janssen

pkg/controller/drain/drain_controller.go

@@ -268,9 +268,7 @@ func (ctrl *Controller) handleErr(err error, key string) {
 	ctrl.queue.AddAfter(key, 1*time.Minute)
 }
 
-// TODO: look into idea of passing poolname into this function to apply to mcn
 func (ctrl *Controller) syncNode(key string) error {
-	klog.Errorf("in syncNode with key: %v", key)
 	startTime := time.Now()
 	klog.V(4).Infof("Started syncing node %q (%v)", key, startTime)
 	defer func() {

pkg/controller/node/node_controller.go

@@ -610,7 +610,6 @@ func (ctrl *Controller) updateNode(old, cur interface{}) {
 		ctrl.logPoolNode(pool, curNode, "changed from pool %s", oldPool.Name)
 		// Let's also make sure the old pool node counts/status get updated
 		ctrl.enqueueMachineConfigPool(oldPool)
-		// Update the node's MCN to reference the new pool
 	} else if err != nil {
 		// getPrimaryPoolForNode may error due to multiple custom pools. In this scenario, let's
 		// queue all of them so that when the node attempts to exit from this error state, the MCP

pkg/daemon/drain.go

@@ -48,7 +48,6 @@ func (dn *Daemon) performDrain() error {
 			return err
 		}
 
-		// err = upgrademonitor.GenerateAndApplyMachineConfigNodes(
 		err = upgrademonitor.GenerateAndApplyMachineConfigNodes(
 			&upgrademonitor.Condition{State: mcfgalphav1.MachineConfigNodeUpdateExecuted, Reason: string(mcfgalphav1.MachineConfigNodeUpdateDrained), Message: "Node Drain Not required for this update."},
 			&upgrademonitor.Condition{State: mcfgalphav1.MachineConfigNodeUpdateDrained, Reason: fmt.Sprintf("%s%s", string(mcfgalphav1.MachineConfigNodeUpdateExecuted), string(mcfgalphav1.MachineConfigNodeUpdateDrained)), Message: "Node Drain Not required for this update."},

pkg/daemon/update.go

@@ -1213,16 +1213,6 @@ func (dn *Daemon) update(oldConfig, newConfig *mcfgv1.MachineConfig, skipCertifi
 	if err != nil {
 		klog.Errorf("Error making MCN for Update Compatible: %v", err)
 	}
-	// TODO: delete in cleanup; pools can be targeted by labels other than those starting with "node-role.kubernetes.io/""
-	// pool := ""
-	// var ok bool
-	// if dn.node != nil {
-	// 	if _, ok = dn.node.Labels["node-role.kubernetes.io/worker"]; ok {
-	// 		pool = "worker"
-	// 	} else if _, ok = dn.node.Labels["node-role.kubernetes.io/master"]; ok {
-	// 		pool = "master"
-	// 	}
-	// }
 
 	err = upgrademonitor.GenerateAndApplyMachineConfigNodeSpec(dn.featureGatesAccessor, pool, dn.node, dn.mcfgClient)
 	if err != nil {

pkg/upgrademonitor/upgrade_monitor.go

@@ -106,15 +106,6 @@ func generateAndApplyMachineConfigNodes(
 		return nil
 	}
 
-	// TODO: delete in cleanup; pools can be targeted by labels other than those starting with "node-role.kubernetes.io/""
-	// var pool string
-	// var ok bool
-	// if _, ok = node.Labels["node-role.kubernetes.io/worker"]; ok {
-	// 	pool = "worker"
-	// } else if _, ok = node.Labels["node-role.kubernetes.io/master"]; ok {
-	// 	pool = "master"
-	// }
-
 	// get the existing MCN, or if it DNE create one below
 	mcNode, needNewMCNode := createOrGetMachineConfigNode(mcfgClient, node)
 	newMCNode := mcNode.DeepCopy()