refactor scheduler extender related API
- move extender related API from pkg/scheduler/api to pkg/scheduler/apis/extender/v1 - alias extenderv1 to pkg/scheduler/apis/extender/v1 - use NodeScore and NodeScoreList in non-extender logic
This commit is contained in:
@@ -24,7 +24,7 @@ import (
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/klog"
|
||||
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
|
||||
"k8s.io/kubernetes/pkg/scheduler/api"
|
||||
extenderv1 "k8s.io/kubernetes/pkg/scheduler/apis/extender/v1"
|
||||
)
|
||||
|
||||
// GetContainerPorts returns the used host ports of Pods: if 'port' was used, a 'port:true' pair
|
||||
@@ -64,7 +64,7 @@ func GetPodStartTime(pod *v1.Pod) *metav1.Time {
|
||||
|
||||
// GetEarliestPodStartTime returns the earliest start time of all pods that
|
||||
// have the highest priority among all victims.
|
||||
func GetEarliestPodStartTime(victims *api.Victims) *metav1.Time {
|
||||
func GetEarliestPodStartTime(victims *extenderv1.Victims) *metav1.Time {
|
||||
if len(victims.Pods) == 0 {
|
||||
// should not reach here.
|
||||
klog.Errorf("victims.Pods is empty. Should not reach here.")
|
||||
|
@@ -26,7 +26,7 @@ import (
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/util/diff"
|
||||
"k8s.io/kubernetes/pkg/api/v1/pod"
|
||||
"k8s.io/kubernetes/pkg/scheduler/api"
|
||||
extenderv1 "k8s.io/kubernetes/pkg/scheduler/apis/extender/v1"
|
||||
)
|
||||
|
||||
// TestSortableList tests SortableList by storing pods in the list and sorting
|
||||
@@ -209,7 +209,7 @@ func TestGetEarliestPodStartTime(t *testing.T) {
|
||||
pod1 := newPriorityPodWithStartTime("pod1", 1, currentTime.Add(time.Second))
|
||||
pod2 := newPriorityPodWithStartTime("pod2", 2, currentTime.Add(time.Second))
|
||||
pod3 := newPriorityPodWithStartTime("pod3", 2, currentTime)
|
||||
victims := &api.Victims{
|
||||
victims := &extenderv1.Victims{
|
||||
Pods: []*v1.Pod{pod1, pod2, pod3},
|
||||
}
|
||||
startTime := GetEarliestPodStartTime(victims)
|
||||
@@ -220,7 +220,7 @@ func TestGetEarliestPodStartTime(t *testing.T) {
|
||||
pod1 = newPriorityPodWithStartTime("pod1", 2, currentTime)
|
||||
pod2 = newPriorityPodWithStartTime("pod2", 2, currentTime.Add(time.Second))
|
||||
pod3 = newPriorityPodWithStartTime("pod3", 2, currentTime.Add(2*time.Second))
|
||||
victims = &api.Victims{
|
||||
victims = &extenderv1.Victims{
|
||||
Pods: []*v1.Pod{pod1, pod2, pod3},
|
||||
}
|
||||
startTime = GetEarliestPodStartTime(victims)
|
||||
|
Reference in New Issue
Block a user