From 9219a762661758190d37a2edfcb8eba925d6f5e1 Mon Sep 17 00:00:00 2001 From: Guoliang Wang Date: Fri, 18 May 2018 22:20:42 +0800 Subject: [PATCH] remove unused code of (pkg/scheduler) --- .../priorities/selector_spreading_test.go | 1 - pkg/scheduler/core/BUILD | 1 - pkg/scheduler/core/equivalence_cache_test.go | 2 -- pkg/scheduler/core/extender_test.go | 18 +++++++----------- pkg/scheduler/schedulercache/cache_test.go | 1 - 5 files changed, 7 insertions(+), 16 deletions(-) diff --git a/pkg/scheduler/algorithm/priorities/selector_spreading_test.go b/pkg/scheduler/algorithm/priorities/selector_spreading_test.go index bf6fda25635..71b440755fc 100644 --- a/pkg/scheduler/algorithm/priorities/selector_spreading_test.go +++ b/pkg/scheduler/algorithm/priorities/selector_spreading_test.go @@ -409,7 +409,6 @@ func TestZoneSelectorSpreadPriority(t *testing.T) { tests := []struct { pod *v1.Pod pods []*v1.Pod - nodes []string rcs []*v1.ReplicationController rss []*extensions.ReplicaSet services []*v1.Service diff --git a/pkg/scheduler/core/BUILD b/pkg/scheduler/core/BUILD index c90aefbee40..8068659c199 100644 --- a/pkg/scheduler/core/BUILD +++ b/pkg/scheduler/core/BUILD @@ -27,7 +27,6 @@ go_test( "//vendor/k8s.io/api/apps/v1beta1:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/extensions/v1beta1:go_default_library", - "//vendor/k8s.io/api/policy/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", diff --git a/pkg/scheduler/core/equivalence_cache_test.go b/pkg/scheduler/core/equivalence_cache_test.go index 9654515c2b4..3b33917a14d 100644 --- a/pkg/scheduler/core/equivalence_cache_test.go +++ b/pkg/scheduler/core/equivalence_cache_test.go @@ -635,7 +635,6 @@ func TestInvalidateCachedPredicateItemOfAllNodes(t *testing.T) { tests := []struct { podName string nodeName string - predicateKey string equivalenceHashForUpdatePredicate uint64 cachedItem predicateItemType }{ @@ -707,7 +706,6 @@ func TestInvalidateAllCachedPredicateItemOfNode(t *testing.T) { tests := []struct { podName string nodeName string - predicateKey string equivalenceHashForUpdatePredicate uint64 cachedItem predicateItemType }{ diff --git a/pkg/scheduler/core/extender_test.go b/pkg/scheduler/core/extender_test.go index 80ed8cc31f0..b0e7489312d 100644 --- a/pkg/scheduler/core/extender_test.go +++ b/pkg/scheduler/core/extender_test.go @@ -22,7 +22,6 @@ import ( "time" "k8s.io/api/core/v1" - policy "k8s.io/api/policy/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/kubernetes/pkg/scheduler/algorithm" @@ -117,7 +116,6 @@ type FakeExtender struct { // Cached node information for fake extender cachedNodeNameToInfo map[string]*schedulercache.NodeInfo - cachedPDBs []*policy.PodDisruptionBudget } func (f *FakeExtender) IsIgnorable() bool { @@ -332,15 +330,13 @@ var _ algorithm.SchedulerExtender = &FakeExtender{} func TestGenericSchedulerWithExtenders(t *testing.T) { tests := []struct { - name string - predicates map[string]algorithm.FitPredicate - prioritizers []algorithm.PriorityConfig - extenders []FakeExtender - extenderPredicates []fitPredicate - extenderPrioritizers []priorityConfig - nodes []string - expectedHost string - expectsErr bool + name string + predicates map[string]algorithm.FitPredicate + prioritizers []algorithm.PriorityConfig + extenders []FakeExtender + nodes []string + expectedHost string + expectsErr bool }{ { predicates: map[string]algorithm.FitPredicate{"true": truePredicate}, diff --git a/pkg/scheduler/schedulercache/cache_test.go b/pkg/scheduler/schedulercache/cache_test.go index 748691ffefb..f3a560155ac 100644 --- a/pkg/scheduler/schedulercache/cache_test.go +++ b/pkg/scheduler/schedulercache/cache_test.go @@ -517,7 +517,6 @@ func TestUpdatePod(t *testing.T) { makeBasePod(t, nodeName, "test", "200m", "1Ki", "", []v1.ContainerPort{{HostIP: "127.0.0.1", HostPort: 8080, Protocol: "TCP"}}), } tests := []struct { - podsToAssume []*v1.Pod podsToAdd []*v1.Pod podsToUpdate []*v1.Pod