From 21202b08d487ba3d242312d0dad6a471a0a11217 Mon Sep 17 00:00:00 2001 From: Abdullah Gharaibeh Date: Wed, 8 Jan 2020 17:24:42 -0500 Subject: [PATCH] remove e2e dependency on scheduler/predicates package --- test/e2e/framework/.import-restrictions | 2 -- test/e2e/framework/node/BUILD | 2 +- test/e2e/framework/node/resource.go | 9 ++++++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/test/e2e/framework/.import-restrictions b/test/e2e/framework/.import-restrictions index a797fe9020e..eb36a73028f 100644 --- a/test/e2e/framework/.import-restrictions +++ b/test/e2e/framework/.import-restrictions @@ -76,8 +76,6 @@ "k8s.io/kubernetes/pkg/master/ports", "k8s.io/kubernetes/pkg/registry/core/service/allocator", "k8s.io/kubernetes/pkg/registry/core/service/portallocator", - "k8s.io/kubernetes/pkg/scheduler/algorithm", - "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates", "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util", "k8s.io/kubernetes/pkg/scheduler/api", "k8s.io/kubernetes/pkg/scheduler/metrics", diff --git a/test/e2e/framework/node/BUILD b/test/e2e/framework/node/BUILD index 8f605f0be96..95c56e2f1b2 100644 --- a/test/e2e/framework/node/BUILD +++ b/test/e2e/framework/node/BUILD @@ -9,8 +9,8 @@ go_library( importpath = "k8s.io/kubernetes/test/e2e/framework/node", visibility = ["//visibility:public"], deps = [ + "//pkg/apis/core/v1/helper:go_default_library", "//pkg/controller/nodelifecycle:go_default_library", - "//pkg/scheduler/algorithm/predicates:go_default_library", "//pkg/scheduler/nodeinfo:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/test/e2e/framework/node/resource.go b/test/e2e/framework/node/resource.go index aed9550774d..a8492e85cc1 100644 --- a/test/e2e/framework/node/resource.go +++ b/test/e2e/framework/node/resource.go @@ -29,8 +29,8 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" + v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" nodectlr "k8s.io/kubernetes/pkg/controller/nodelifecycle" - "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates" schedulernodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo" e2elog "k8s.io/kubernetes/test/e2e/framework/log" "k8s.io/kubernetes/test/e2e/system" @@ -463,12 +463,15 @@ func isNodeUntaintedWithNonblocking(node *v1.Node, nonblockingTaints string) boo nodeInfo.SetNode(node) } - fit, _, err := predicates.PodToleratesNodeTaints(fakePod, nil, nodeInfo) + taints, err := nodeInfo.Taints() if err != nil { e2elog.Failf("Can't test predicates for node %s: %v", node.Name, err) return false } - return fit + + return v1helper.TolerationsTolerateTaintsWithFilter(fakePod.Spec.Tolerations, taints, func(t *v1.Taint) bool { + return t.Effect == v1.TaintEffectNoExecute || t.Effect == v1.TaintEffectNoSchedule + }) } // IsNodeSchedulable returns true if: