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

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

View File

@@ -19,7 +19,6 @@ package util
import (
v1 "k8s.io/api/core/v1"
utilfeature "k8s.io/apiserver/pkg/util/feature"
v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
"k8s.io/kubernetes/pkg/features"
)
@@ -73,7 +72,7 @@ func GetNonzeroRequestForResource(resource v1.ResourceName, requests *v1.Resourc
}
return quantity.Value()
default:
if v1helper.IsScalarResourceName(resource) {
if IsScalarResourceName(resource) {
quantity, found := (*requests)[resource]
if !found {
return 0

View File

@@ -31,6 +31,7 @@ import (
corev1helpers "k8s.io/component-helpers/scheduling/corev1"
"k8s.io/klog/v2"
extenderv1 "k8s.io/kube-scheduler/extender/v1"
v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
)
// GetPodFullName returns a name that uniquely identifies a pod.
@@ -163,3 +164,9 @@ func ClearNominatedNodeName(cs kubernetes.Interface, pods ...*v1.Pod) utilerrors
}
return utilerrors.NewAggregate(errs)
}
// IsScalarResourceName validates the resource for Extended, Hugepages, Native and AttachableVolume resources
func IsScalarResourceName(name v1.ResourceName) bool {
return v1helper.IsExtendedResourceName(name) || v1helper.IsHugePageResourceName(name) ||
v1helper.IsPrefixedNativeResource(name) || v1helper.IsAttachableVolumeResourceName(name)
}