code cleanup

Author: isabella-janssen

pkg/helpers/helpers.go

@@ -55,22 +55,24 @@ func GetNodesForPool(mcpLister v1.MachineConfigPoolLister, nodeLister corev1list
 // temporarily be set to `unknown`. Once the node exists (is not nil) and the annotations are properly set,
 // the node will update again and the pool name will be updated.
 func GetPrimaryPoolNameForMCN(mcpLister v1.MachineConfigPoolLister, node *corev1.Node) (string, error) {
+	// Handle case of nil node
 	if node == nil {
 		klog.Error("node object is nil, setting associated MCP to unknown")
 		return "unknown", nil
-	} else {
-		primaryPool, err := GetPrimaryPoolForNode(mcpLister, node)
-		if err != nil {
-			klog.Errorf("error getting primary pool for node: %v", node.Name)
-			return "", err
-		} else if primaryPool == nil {
-			// On first provisioning, the node may not have annoatations and, thus, will not be associated with a pool
-			klog.Infof("No primary pool is associated with node: %v", node.Name)
-			return "unknown", nil
-		} else {
-			return primaryPool.Name, nil
-		}
 	}
+
+	// Use `GetPrimaryPoolForNode` to get primary MCP associated with node
+	primaryPool, err := GetPrimaryPoolForNode(mcpLister, node)
+	if err != nil {
+		klog.Errorf("error getting primary pool for node: %v", node.Name)
+		return "", err
+	} else if primaryPool == nil {
+		// On first provisioning, the node may not have annoatations and, thus, will not be associated with a pool.
+		// In this case, the pool value will be set to a temporary dummy value.
+		klog.Infof("No primary pool is associated with node: %v", node.Name)
+		return "unknown", nil
+	}
+	return primaryPool.Name, nil
 }
 
 func GetPrimaryPoolForNode(mcpLister v1.MachineConfigPoolLister, node *corev1.Node) (*mcfgv1.MachineConfigPool, error) {