github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 21:53:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #122644 from gyuho/logs-removing-taints

Browse Source 
chores(controller/nodelifecycle): make node taint removal logs more a…
This commit is contained in:
Kubernetes Prow Robot
2024-10-23 01:17:15 +01:00
committed by GitHub
parent c9525d3865 bfc2562d6c
commit 71523a7db6
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

@@ -809,7 +809,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))
} }
} }
} }
@@ -1258,12 +1258,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()