CA: refactor utils related to NodeInfos #7479
Open
+836
−517
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
the
kind/cleanup
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: towca The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
area/cluster-autoscaler
cncf-cla: yes
k8s-ci-robot
added
approved
|
/assign @MaciekPytel |
k8s-ci-robot
added
the
do-not-merge/hold
towca
force-pushed
the
jtuznik/dra-info-utils
branch
from
f013ec0
to
5a9ff97
Compare
towca
force-pushed
the
jtuznik/dra-info-utils
branch
from
5a9ff97
to
3a7c44f
Compare
|
/assign @BigDarkClown |
k8s-ci-robot
added
the
needs-rebase
towca
force-pushed
the
jtuznik/dra-info-utils
branch
from
3a7c44f
to
e0024b0
Compare
k8s-ci-robot
removed
the
needs-rebase
towca
force-pushed
the
jtuznik/dra-info-utils
branch
from
e0024b0
to
a7eea5e
Compare
jackfrancis
reviewed
Nov 19, 2024
| @@ -34,7 +34,7 @@ import ( | |||
| "k8s.io/autoscaler/cluster-autoscaler/core/scaledown/planner" | |||
| scaledownstatus "k8s.io/autoscaler/cluster-autoscaler/core/scaledown/status" | |||
| "k8s.io/autoscaler/cluster-autoscaler/core/scaleup" | |||
| orchestrator "k8s.io/autoscaler/cluster-autoscaler/core/scaleup/orchestrator" | |||
towca
added a commit
to towca/autoscaler
that referenced
this pull request
Nov 20, 2024
towca
added a commit
to towca/autoscaler
that referenced
this pull request
Nov 20, 2024
simulator.BuildNodeInfoForNode, core_utils.GetNodeInfoFromTemplate, and scheduler_utils.DeepCopyTemplateNode all had very similar logic for sanitizing and copying NodeInfos. They're all consolidated to one file in simulator, sharing common logic. DeepCopyNodeInfo is changed to be a framework.NodeInfo method. MixedTemplateNodeInfoProvider now correctly uses ClusterSnapshot to correlate Nodes to scheduled pods, instead of using a live Pod lister. This means that the snapshot now has to be properly initialized in a bunch of tests.
towca
force-pushed
the
jtuznik/dra-info-utils
branch
from
a7eea5e
to
89a5259
Compare
jackfrancis
reviewed
Nov 21, 2024
| } | ||
| nodeInfo, err := simulator.BuildNodeInfoForNode(sanitizedNode, podsForNodes[node.Name], daemonsets, p.forceDaemonSets) | ||
| templateNodeInfo, caErr := simulator.TemplateNodeInfoFromExampleNodeInfo(nodeInfo, id, daemonsets, p.forceDaemonSets, taintConfig) | ||
| if err != nil { |
There was a problem hiding this comment.
should be if caErr != nil { here?
(also do we need to define a new caErr variable here instead of just re-using err?)
jackfrancis
reviewed
Nov 21, 2024
| for _, slice := range n.LocalResourceSlices { | ||
| newSlices = append(newSlices, slice.DeepCopy()) | ||
| } | ||
| return NewNodeInfo(n.Node().DeepCopy(), newSlices, newPods...) |
There was a problem hiding this comment.
Because the NewNodeInfo constructor only sets a node object if the passed in node is not nil:
if node != nil {
result.schedNodeInfo.SetNode(node)
}
... invoking n.Node().DeepCopy(), inline like this might be (theoretically) subject to a nil pointer exception
jackfrancis
reviewed
Nov 21, 2024
| id := nodeGroup.Id() | ||
| baseNodeInfo, err := nodeGroup.TemplateNodeInfo() | ||
| if err != nil { | ||
| return nil, errors.ToAutoscalerError(errors.CloudProviderError, err) |
There was a problem hiding this comment.
is this error response too generic?
jackfrancis
reviewed
Nov 21, 2024
| // TemplateNodeInfoFromNodeGroupTemplate returns a template NodeInfo object based on NodeGroup.TemplateNodeInfo(). The template is sanitized, and only | ||
| // contains the pods that should appear on a new Node from the same node group (e.g. DaemonSet pods). | ||
| func TemplateNodeInfoFromNodeGroupTemplate(nodeGroup nodeGroupTemplateNodeInfoGetter, daemonsets []*appsv1.DaemonSet, taintConfig taints.TaintConfig) (*framework.NodeInfo, errors.AutoscalerError) { | ||
| id := nodeGroup.Id() |
There was a problem hiding this comment.
I don't think we need to assign this to a var
jackfrancis
reviewed
Nov 21, 2024
| return TemplateNodeInfoFromExampleNodeInfo(baseNodeInfo, id, daemonsets, true, taintConfig) | ||
| } | ||
|
|
||
| // TemplateNodeInfoFromExampleNodeInfo returns a template NodeInfo object based on a real example NodeInfo from the cluster. The template is sanitized, and only |
There was a problem hiding this comment.
Not sure if I love the term "example" here. Would TemplateNodeInfoFromNode or TemplateNodeInfoFromRealNode or TemplateNodeInfoFromRealNodeInfo work? Then we'd document like this
// TemplateNodeInfoFromNode returns a template NodeInfo object based on a NodeInfo from a real node on the cluster. The template is sanitized, and only
// We need to sanitize the node before determining the DS pods, since taints are checked there, and
// we might need to filter some out during sanitization.
sanitizedNode := sanitizeNodeInfo(realNode, newNodeNameBase, randSuffix, &taintConfig)
// No need to sanitize the expected pods again - they either come from sanitizedNode and were sanitized above,
etc.
I think my observation is that the word "example" suggests something non-real, mock object, something like that.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
/kind cleanup
What this PR does / why we need it:
This is a part of Dynamic Resource Allocation (DRA) support in Cluster Autoscaler. There were multiple very similar utils related to copying and sanitizing NodeInfos scattered around the CA codebase. Instead of adding similar DRA handling to all of them separately, they're consolidated into a single location that will be later adapted to handle DRA.
Which issue(s) this PR fixes:
The CA/DRA integration is tracked in kubernetes/kubernetes#118612, this is just part of the implementation.
Special notes for your reviewer:
The first commit in the PR is just a squash of #7466, and it shouldn't be a part of this review. The PR will be rebased on top of master after #7466 is merged.
This is intended to be a no-op refactor. It was extracted from #7350 after #7447, and #7466.
Does this PR introduce a user-facing change?
Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.: