github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-13 13:55:41 +00:00
Code Issues Projects Releases Wiki Activity

Add extended resources to ContainerStatuses[i].Resources

Browse Source 
Signed-off-by: Itamar Holder <iholder@redhat.com>
This commit is contained in:
Itamar Holder 2024-04-07 16:24:26 +03:00
parent f164b47ae7
commit a482d8937b
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/kubelet/kubelet_pods.go
View File

@ -2110,6 +2110,15 @@ func (kl *Kubelet) convertToAPIContainerStatuses(pod *v1.Pod, podStatus *kubecon
if ephemeralStorage, found := container.Resources.Limits[v1.ResourceEphemeralStorage]; found { if ephemeralStorage, found := container.Resources.Limits[v1.ResourceEphemeralStorage]; found {
limits[v1.ResourceEphemeralStorage] = ephemeralStorage.DeepCopy() limits[v1.ResourceEphemeralStorage] = ephemeralStorage.DeepCopy()
} }
for extendedResourceName, extendedResourceQuantity := range container.Resources.Limits {
if extendedResourceName == v1.ResourceCPU || extendedResourceName == v1.ResourceMemory ||
extendedResourceName == v1.ResourceStorage || extendedResourceName == v1.ResourceEphemeralStorage {
continue
}
limits[extendedResourceName] = extendedResourceQuantity.DeepCopy()
}
} }
// Convert Requests // Convert Requests
if status.AllocatedResources != nil { if status.AllocatedResources != nil {
@ -2125,6 +2134,15 @@ func (kl *Kubelet) convertToAPIContainerStatuses(pod *v1.Pod, podStatus *kubecon
if ephemeralStorage, found := status.AllocatedResources[v1.ResourceEphemeralStorage]; found { if ephemeralStorage, found := status.AllocatedResources[v1.ResourceEphemeralStorage]; found {
requests[v1.ResourceEphemeralStorage] = ephemeralStorage.DeepCopy() requests[v1.ResourceEphemeralStorage] = ephemeralStorage.DeepCopy()
} }
for extendedResourceName, extendedResourceQuantity := range status.AllocatedResources {
if extendedResourceName == v1.ResourceCPU || extendedResourceName == v1.ResourceMemory ||
extendedResourceName == v1.ResourceStorage || extendedResourceName == v1.ResourceEphemeralStorage {
continue
}
requests[extendedResourceName] = extendedResourceQuantity.DeepCopy()
}
} }
//TODO(vinaykul,derekwaynecarr,InPlacePodVerticalScaling): Update this to include extended resources in //TODO(vinaykul,derekwaynecarr,InPlacePodVerticalScaling): Update this to include extended resources in
// addition to CPU, memory, ephemeral storage. Add test case for extended resources. // addition to CPU, memory, ephemeral storage. Add test case for extended resources.