github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-11 21:12:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #101466 from ingvagabund/GetNonzeroRequestForResource-drop-check-for-scalar-resource

Browse Source 
Drop IsScalarResourceName check in GetNonzeroRequestForResource
This commit is contained in:
Kubernetes Prow Robot 2021-05-01 12:52:00 -07:00 committed by GitHub
commit 9a60677591
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/scheduler/util/non_zero.go
View File

@ -47,6 +47,9 @@ func GetNonzeroRequests(requests *v1.ResourceList) (int64, int64) {
// GetNonzeroRequestForResource returns the default resource request if none is found or // GetNonzeroRequestForResource returns the default resource request if none is found or
// what is provided on the request. // what is provided on the request.
func GetNonzeroRequestForResource(resource v1.ResourceName, requests *v1.ResourceList) int64 { func GetNonzeroRequestForResource(resource v1.ResourceName, requests *v1.ResourceList) int64 {
if requests == nil {
return 0
}
switch resource { switch resource {
case v1.ResourceCPU: case v1.ResourceCPU:
// Override if un-set, but not if explicitly set to zero // 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() return quantity.Value()
default: default:
if IsScalarResourceName(resource) { quantity, found := (*requests)[resource]
quantity, found := (*requests)[resource] if !found {
if !found { return 0
return 0
}
return quantity.Value()
} }
return quantity.Value()
} }
return 0
} }