Merge pull request #31767 from luthermonson/fix-nodepools

[release/v2.5.8-rc1] add more error checking for nodepools

pkg/controllers/management/node/controller.go

@@ -287,10 +287,10 @@ func (m *Lifecycle) Remove(obj *v3.Node) (runtime.Object, error) {
 }
 
 func (m *Lifecycle) enqueueNodePool(obj *v3.Node) {
-	logrus.Errorf("[node] enqueing node pool %s", obj.Spec.NodePoolName)
+	logrus.Debugf("[node-controller] enqueing node pool %s", obj.Spec.NodePoolName)
 	pool, err := m.getNodePool(obj.Spec.NodePoolName)
 	if err != nil {
-		logrus.Errorf("[node] error finding pool %s", obj.Spec.NodePoolName)
+		logrus.Errorf("[node-controller] enqueue nodepool error %s: %s", obj.Spec.NodePoolName, err)
 		return
 	}
 	m.nodePoolController.Enqueue(pool.Namespace, pool.Name)
@@ -530,6 +530,9 @@ func (m *Lifecycle) scaledown(obj *v3.Node) (runtime.Object, error) {
 	// time to scaledown, send to nodepool to delete the node
 	pool, err := m.getNodePool(obj.Spec.NodePoolName)
 	if err != nil {
+		if kerror.IsNotFound(err) {
+			return obj, nil
+		}
 		return obj, err
 	}
 
@@ -547,7 +550,7 @@ func (m *Lifecycle) scaledown(obj *v3.Node) (runtime.Object, error) {
 }
 
 func (m *Lifecycle) sync(key string, obj *v3.Node) (runtime.Object, error) {
-	if obj == nil {
+	if obj == nil || obj.DeletionTimestamp != nil {
 		return nil, nil
 	}
 
@@ -885,7 +888,7 @@ func (m *Lifecycle) drainNode(node *v3.Node) error {
 	}
 
 	nodePool, err := m.getNodePool(node.Spec.NodePoolName)
-	if err != nil {
+	if err != nil && !kerror.IsNotFound(err) {
 		return err
 	}
 

pkg/node/node.go

@@ -193,7 +193,7 @@ func DrainBeforeDelete(node *v3.Node, cluster *v3.Cluster, nodePool *v3.NodePool
 		return true
 	}
 
-	if nodePool.Spec.DrainBeforeDelete {
+	if nodePool != nil && nodePool.Spec.DrainBeforeDelete {
 		return true
 	}