mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-12 21:36:24 +00:00
Add extended resources to ContainerStatuses[i].Resources
Signed-off-by: Itamar Holder <iholder@redhat.com>
This commit is contained in:
parent
f164b47ae7
commit
a482d8937b
@ -2110,6 +2110,15 @@ func (kl *Kubelet) convertToAPIContainerStatuses(pod *v1.Pod, podStatus *kubecon
|
||||
if ephemeralStorage, found := container.Resources.Limits[v1.ResourceEphemeralStorage]; found {
|
||||
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
|
||||
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 {
|
||||
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
|
||||
// addition to CPU, memory, ephemeral storage. Add test case for extended resources.
|
||||
|
Loading…
Reference in New Issue
Block a user