diff --git a/pkg/scheduler/util/non_zero.go b/pkg/scheduler/util/non_zero.go index bf8c47c5378..f8a95ab217c 100644 --- a/pkg/scheduler/util/non_zero.go +++ b/pkg/scheduler/util/non_zero.go @@ -47,6 +47,9 @@ func GetNonzeroRequests(requests *v1.ResourceList) (int64, int64) { // GetNonzeroRequestForResource returns the default resource request if none is found or // what is provided on the request. func GetNonzeroRequestForResource(resource v1.ResourceName, requests *v1.ResourceList) int64 { + if requests == nil { + return 0 + } switch resource { case v1.ResourceCPU: // Override if un-set, but not if explicitly set to zero @@ -72,13 +75,10 @@ func GetNonzeroRequestForResource(resource v1.ResourceName, requests *v1.Resourc } return quantity.Value() default: - if IsScalarResourceName(resource) { - quantity, found := (*requests)[resource] - if !found { - return 0 - } - return quantity.Value() + quantity, found := (*requests)[resource] + if !found { + return 0 } + return quantity.Value() } - return 0 }