Break volumebinding Filter plugins dependency on predicates package

This commit is contained in:
Haosdent Huang
2019-12-31 15:40:50 +08:00
parent 180e1c9f51
commit d27dc6751e
6 changed files with 16 additions and 17 deletions

View File

@@ -24,7 +24,6 @@ import (
v1 "k8s.io/api/core/v1"
volumescheduling "k8s.io/kubernetes/pkg/controller/volume/scheduling"
"k8s.io/kubernetes/pkg/scheduler/algorithm/predicates"
framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
schedulernodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo"
"k8s.io/kubernetes/pkg/scheduler/volumebinder"
@@ -73,7 +72,7 @@ func TestVolumeBinding(t *testing.T) {
FindUnboundSatsified: false,
FindBoundSatsified: true,
},
wantStatus: framework.NewStatus(framework.UnschedulableAndUnresolvable, predicates.ErrVolumeBindConflict.GetReason()),
wantStatus: framework.NewStatus(framework.UnschedulableAndUnresolvable, ErrReasonBindConflict),
},
{
name: "bound and unbound unsatisfied",
@@ -83,8 +82,8 @@ func TestVolumeBinding(t *testing.T) {
FindUnboundSatsified: false,
FindBoundSatsified: false,
},
wantStatus: framework.NewStatus(framework.UnschedulableAndUnresolvable, predicates.ErrVolumeNodeConflict.GetReason(),
predicates.ErrVolumeBindConflict.GetReason()),
wantStatus: framework.NewStatus(framework.UnschedulableAndUnresolvable, ErrReasonNodeConflict,
ErrReasonBindConflict),
},
{
name: "unbound/found matches/bind succeeds",