github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removing GetPodPriority from pkg/api and importing PodPriority from k8s.io/component-helpers

Browse Source
This commit is contained in:
Jan Chaloupka
2020-10-08 12:54:35 +02:00
parent 95ad020a75
commit 274c536da3
14 changed files with 33 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,9 +28,9 @@ import (
utilerrors "k8s.io/apimachinery/pkg/util/errors"
"k8s.io/apimachinery/pkg/util/strategicpatch"
"k8s.io/client-go/kubernetes"
corev1helpers "k8s.io/component-helpers/scheduling/corev1"
"k8s.io/klog/v2"
extenderv1 "k8s.io/kube-scheduler/extender/v1"
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
)
// GetPodFullName returns a name that uniquely identifies a pod.
@@ -60,15 +60,15 @@ func GetEarliestPodStartTime(victims *extenderv1.Victims) *metav1.Time {
}
earliestPodStartTime := GetPodStartTime(victims.Pods[0])
maxPriority := podutil.GetPodPriority(victims.Pods[0])
maxPriority := corev1helpers.PodPriority(victims.Pods[0])
for _, pod := range victims.Pods {
if podutil.GetPodPriority(pod) == maxPriority {
if corev1helpers.PodPriority(pod) == maxPriority {
if GetPodStartTime(pod).Before(earliestPodStartTime) {
earliestPodStartTime = GetPodStartTime(pod)
}
} else if podutil.GetPodPriority(pod) > maxPriority {
maxPriority = podutil.GetPodPriority(pod)
} else if corev1helpers.PodPriority(pod) > maxPriority {
maxPriority = corev1helpers.PodPriority(pod)
earliestPodStartTime = GetPodStartTime(pod)
}
}
@@ -81,8 +81,8 @@ func GetEarliestPodStartTime(victims *extenderv1.Victims) *metav1.Time {
// It takes arguments of the type "interface{}" to be used with SortableList,
// but expects those arguments to be *v1.Pod.
func MoreImportantPod(pod1, pod2 *v1.Pod) bool {
p1 := podutil.GetPodPriority(pod1)
p2 := podutil.GetPodPriority(pod2)
p1 := corev1helpers.PodPriority(pod1)
p2 := corev1helpers.PodPriority(pod2)
if p1 != p2 {
return p1 > p2
}