kubernetes
/
autoscaler
mirror of https://github.com/kubernetes/autoscaler.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only log when we fail to get NodeGroup for a node.

This commit is contained in:
maxime 2024-01-19 14:10:33 +00:00
parent 90e24ac528
commit a47ef89f5a
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cluster-autoscaler/core/static_autoscaler.go
View File

@ -229,12 +229,7 @@ func (a *StaticAutoscaler) cleanUpIfRequired() {
klog.Errorf("Failed to list ready nodes, not cleaning up taints: %v", err) klog.Errorf("Failed to list ready nodes, not cleaning up taints: %v", err)
} else { } else {
// Make sure we are only cleaning taints from selected node groups. // Make sure we are only cleaning taints from selected node groups.
// If filtering fails, we use the initial list of all nodes as a fallback. selectedNodes := filterNodesFromSelectedGroups(a.CloudProvider, allNodes...)
selectedNodes, err := filterNodesFromSelectedGroups(a.CloudProvider, allNodes...)
if err != nil {
klog.Warningf("Failed to filter nodes based on selected node groups: %v", err)
selectedNodes = allNodes
}
taints.CleanAllToBeDeleted(selectedNodes, taints.CleanAllToBeDeleted(selectedNodes,
a.AutoscalingContext.ClientSet, a.Recorder, a.CordonNodeBeforeTerminate) a.AutoscalingContext.ClientSet, a.Recorder, a.CordonNodeBeforeTerminate)
if a.AutoscalingContext.AutoscalingOptions.MaxBulkSoftTaintCount == 0 { if a.AutoscalingContext.AutoscalingOptions.MaxBulkSoftTaintCount == 0 {
@ -669,12 +664,7 @@ func (a *StaticAutoscaler) RunOnce(currentTime time.Time) caerrors.AutoscalerErr
taintableNodes := a.scaleDownPlanner.UnneededNodes() taintableNodes := a.scaleDownPlanner.UnneededNodes()
// Make sure we are only cleaning taints from selected node groups. // Make sure we are only cleaning taints from selected node groups.
// If filtering fails, we use the initial list of all nodes as a fallback. selectedNodes := filterNodesFromSelectedGroups(a.CloudProvider, allNodes...)
selectedNodes, err := filterNodesFromSelectedGroups(a.CloudProvider, allNodes...)
if err != nil {
klog.Warningf("Failed filtering nodes based on selected node groups: %v", err)
selectedNodes = allNodes
}
// This is a sanity check to make sure `taintableNodes` only includes // This is a sanity check to make sure `taintableNodes` only includes
// nodes from selected nodes. // nodes from selected nodes.
@ -983,17 +973,16 @@ func (a *StaticAutoscaler) obtainNodeLists(cp cloudprovider.CloudProvider) ([]*a
return allNodes, readyNodes, nil return allNodes, readyNodes, nil
} }
func filterNodesFromSelectedGroups(cp cloudprovider.CloudProvider, nodes ...*apiv1.Node) ([]*apiv1.Node, caerrors.AutoscalerError) { func filterNodesFromSelectedGroups(cp cloudprovider.CloudProvider, nodes ...*apiv1.Node) []*apiv1.Node {
filtered := make([]*apiv1.Node, 0, len(nodes)) filtered := make([]*apiv1.Node, 0, len(nodes))
for _, n := range nodes { for _, n := range nodes {
if ng, err := cp.NodeGroupForNode(n); err != nil { if ng, err := cp.NodeGroupForNode(n); err != nil {
klog.Errorf("Failed to get a node group node node: %v", err) klog.Errorf("Failed to get a node group node node: %v", err)
return nil, caerrors.ToAutoscalerError(caerrors.CloudProviderError, err)
} else if ng != nil { } else if ng != nil {
filtered = append(filtered, n) filtered = append(filtered, n)
} }
} }
return filtered, nil return filtered
} }
func (a *StaticAutoscaler) updateClusterState(allNodes []*apiv1.Node, nodeInfosForGroups map[string]*schedulerframework.NodeInfo, currentTime time.Time) caerrors.AutoscalerError { func (a *StaticAutoscaler) updateClusterState(allNodes []*apiv1.Node, nodeInfosForGroups map[string]*schedulerframework.NodeInfo, currentTime time.Time) caerrors.AutoscalerError {