github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-11 06:02:18 +00:00
Code Issues Projects Releases Wiki Activity

chores(controller/nodelifecycle): make node taint removal logs more accurate

Browse Source 
Signed-off-by: Gyuho Lee <gyuho@lepton.ai>
This commit is contained in:
Gyuho Lee
2024-01-08 20:54:05 +08:00
parent 18608cc56b
commit bfc2562d6c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/controller/nodelifecycle/node_lifecycle_controller.go
View File

@@ -797,7 +797,7 @@ func (nc *Controller) processTaintBaseEviction(ctx context.Context, node *v1.Nod
logger.Error(nil, "Failed to remove taints from node. Will retry in next iteration", "node", klog.KObj(node)) logger.Error(nil, "Failed to remove taints from node. Will retry in next iteration", "node", klog.KObj(node))
} }
if removed { if removed {
logger.V(2).Info("Node is healthy again, removing all taints", "node", klog.KObj(node)) logger.V(2).Info("Node is healthy again, removed all taints", "node", klog.KObj(node))
} }
} }
} }
@@ -1246,12 +1246,12 @@ func (nc *Controller) markNodeAsReachable(ctx context.Context, node *v1.Node) (b
err := controller.RemoveTaintOffNode(ctx, nc.kubeClient, node.Name, node, UnreachableTaintTemplate) err := controller.RemoveTaintOffNode(ctx, nc.kubeClient, node.Name, node, UnreachableTaintTemplate)
logger := klog.FromContext(ctx) logger := klog.FromContext(ctx)
if err != nil { if err != nil {
logger.Error(err, "Failed to remove taint from node", "node", klog.KObj(node)) logger.Error(err, "Failed to remove unreachable taint from node", "node", klog.KObj(node))
return false, err return false, err
} }
err = controller.RemoveTaintOffNode(ctx, nc.kubeClient, node.Name, node, NotReadyTaintTemplate) err = controller.RemoveTaintOffNode(ctx, nc.kubeClient, node.Name, node, NotReadyTaintTemplate)
if err != nil { if err != nil {
logger.Error(err, "Failed to remove taint from node", "node", klog.KObj(node)) logger.Error(err, "Failed to remove not-ready taint from node", "node", klog.KObj(node))
return false, err return false, err
} }
nc.evictorLock.Lock() nc.evictorLock.Lock()