github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-11-27 19:16:16 +00:00
Code Issues Projects Releases Wiki Activity

Move pkg/apis/core/v1.IsScalarResourceName under pkg/scheduler/util

Browse Source 
IsScalarResourceName is imported only inside pkg/scheduler packages.
This commit is contained in:
Jan Chaloupka
2020-10-27 13:40:30 +01:00
parent b4258ec138
commit 6822a0ec20
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/scheduler/framework/plugins/noderesources/resource_allocation.go
View File

@@ -20,7 +20,6 @@ import (
v1 "k8s.io/api/core/v1"
utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/klog/v2"
v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
"k8s.io/kubernetes/pkg/features"
"k8s.io/kubernetes/pkg/scheduler/framework"
schedutil "k8s.io/kubernetes/pkg/scheduler/util"
@@ -100,7 +99,7 @@ func calculateResourceAllocatableRequest(nodeInfo *framework.NodeInfo, pod *v1.P
case v1.ResourceEphemeralStorage:
return nodeInfo.Allocatable.EphemeralStorage, (nodeInfo.Requested.EphemeralStorage + podRequest)
default:
if v1helper.IsScalarResourceName(resource) {
if schedutil.IsScalarResourceName(resource) {
return nodeInfo.Allocatable.ScalarResources[resource], (nodeInfo.Requested.ScalarResources[resource] + podRequest)
}
}