add SetMaxResource for Resource

This commit is contained in:
wackxu
2018-04-21 16:13:58 +08:00
parent afa68cc287
commit adea3733a8
4 changed files with 83 additions and 49 deletions

View File

@@ -668,29 +668,7 @@ func GetResourceRequest(pod *v1.Pod) *schedulercache.Resource {
// take max_resource(sum_pod, any_init_container)
for _, container := range pod.Spec.InitContainers {
for rName, rQuantity := range container.Resources.Requests {
switch rName {
case v1.ResourceMemory:
if mem := rQuantity.Value(); mem > result.Memory {
result.Memory = mem
}
case v1.ResourceEphemeralStorage:
if ephemeralStorage := rQuantity.Value(); ephemeralStorage > result.EphemeralStorage {
result.EphemeralStorage = ephemeralStorage
}
case v1.ResourceCPU:
if cpu := rQuantity.MilliValue(); cpu > result.MilliCPU {
result.MilliCPU = cpu
}
default:
if v1helper.IsScalarResourceName(rName) {
value := rQuantity.Value()
if value > result.ScalarResources[rName] {
result.SetScalar(rName, value)
}
}
}
}
result.SetMaxResource(container.Resources.Requests)
}
return result