New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Kubectl: take pod overhead into account for node info #81929
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -28,7 +28,9 @@ import ( | |
) | ||
|
||
// PodRequestsAndLimits returns a dictionary of all defined resources summed up for all | ||
// containers of the pod. | ||
// containers of the pod. If pod overhead is non-nil, the pod overhead is added to the | ||
// total container resource requests and to the total container limits which have a | ||
// non-zero quantity. | ||
func PodRequestsAndLimits(pod *corev1.Pod) (reqs, limits corev1.ResourceList) { | ||
reqs, limits = corev1.ResourceList{}, corev1.ResourceList{} | ||
for _, container := range pod.Spec.Containers { | ||
|
@@ -40,6 +42,18 @@ func PodRequestsAndLimits(pod *corev1.Pod) (reqs, limits corev1.ResourceList) { | |
maxResourceList(reqs, container.Resources.Requests) | ||
maxResourceList(limits, container.Resources.Limits) | ||
} | ||
|
||
// Add overhead for running a pod to the sum of requests and to non-zero limits: | ||
if pod.Spec.Overhead != nil { | ||
addResourceList(reqs, pod.Spec.Overhead) | ||
|
||
for name, quantity := range pod.Spec.Overhead { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It seems the rule here is:
Is it the case? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Correct. |
||
if value, ok := limits[name]; ok && !value.IsZero() { | ||
value.Add(quantity) | ||
limits[name] = value | ||
} | ||
} | ||
} | ||
return | ||
} | ||
|
||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If the feature gate is disabled in apiserver, we have logic setting it to nil, right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No.If someone is explicitly setting this in the Pod.Spec when the feature gate is not enabled, the value will persist.if the feature gate is enabled, the RuntimeClass admission controller will validate the Pod.Spec to make sure the defined overhead matches what is defined in a given RuntimeClass. If it doesn't match, the pod is rejected.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We are dropping it server-side if the feature gate is disabled: https://github.com/kubernetes/kubernetes/blob/master/pkg/api/pod/util.go#L399-L402
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That makes sense then.