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

Merge pull request #128377 from tallclair/allocated-status-2 

[FG:InPlacePodVerticalScaling] Implement AllocatedResources status changes for Beta

Kubernetes-commit: f81a68f4888c9da87f856d17516fb810518a67c0
This commit is contained in:
Kubernetes Publisher 2024-11-05 23:21:49 +00:00
parent 913dcdf388 af49e676b2
commit 4b9836ac7a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -34,7 +34,7 @@ require (
k8s.io/cli-runtime v0.0.0-20241105234034-30b82e78f32f
k8s.io/client-go v0.0.0-20241105230542-c1010ffd7de3
k8s.io/component-base v0.0.0-20241105231555-33a822ed3833
k8s.io/component-helpers v0.0.0-20241105231722-d4567c4eae79
k8s.io/component-helpers v0.0.0-20241106031610-152c23240712
k8s.io/klog/v2 v2.130.1
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f
k8s.io/metrics v0.0.0-20241105233853-0eafb3f269f4

4
go.sum
View File

@ -212,8 +212,8 @@ k8s.io/client-go v0.0.0-20241105230542-c1010ffd7de3 h1:ZgoctdRlDLgbqPdEdcgyoyBbV
k8s.io/client-go v0.0.0-20241105230542-c1010ffd7de3/go.mod h1:p8opQH8f5aM1YzHrN0yWNcD4qqfAJIaR0+kVTU/TIBw=
k8s.io/component-base v0.0.0-20241105231555-33a822ed3833 h1:85DceDhD40wu9EBtSDCkSHnYB1Lx0hVgu4pj/ZQLioU=
k8s.io/component-base v0.0.0-20241105231555-33a822ed3833/go.mod h1:LiXjb6P40r1C7CAwQfD9HDBX7LzkVHFgYJOzj1oaFO4=
k8s.io/component-helpers v0.0.0-20241105231722-d4567c4eae79 h1:NFGOuTpkzXvjO+25qKf62FapbNfip/7NQeDC7yGOR+0=
k8s.io/component-helpers v0.0.0-20241105231722-d4567c4eae79/go.mod h1:20oehylAewaR480tjzt53k9buvR28B7/IPICt2B2HwU=
k8s.io/component-helpers v0.0.0-20241106031610-152c23240712 h1:Rrua4apankkeV+AUmvSSj7CsilO2T/s3BCOtIH3u9tE=
k8s.io/component-helpers v0.0.0-20241106031610-152c23240712/go.mod h1:20oehylAewaR480tjzt53k9buvR28B7/IPICt2B2HwU=
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y=

6
pkg/util/resource/resource.go
View File

@ -49,11 +49,11 @@ func podRequests(pod *corev1.Pod) corev1.ResourceList {
for _, container := range pod.Spec.Containers {
containerReqs := container.Resources.Requests
cs, found := containerStatuses[container.Name]
if found {
if found && cs.Resources != nil {
if pod.Status.Resize == corev1.PodResizeStatusInfeasible {
containerReqs = cs.AllocatedResources.DeepCopy()
containerReqs = cs.Resources.Requests.DeepCopy()
} else {
containerReqs = max(container.Resources.Requests, cs.AllocatedResources)
containerReqs = max(container.Resources.Requests, cs.Resources.Requests)
}
}
addResourceList(reqs, containerReqs)