github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-11-02 14:51:58 +00:00
Code Issues Projects Releases Wiki Activity

cleanup unused scheduler functions/files

Browse Source
This commit is contained in:
Abdullah Gharaibeh
2020-01-03 15:30:47 -05:00
parent 9ff3b52913
commit d31dcecd20
14 changed files with 10 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/integration/daemonset/BUILD
View File

@@ -20,7 +20,6 @@ go_test(
"//pkg/controller:go_default_library",
"//pkg/controller/daemon:go_default_library",
"//pkg/scheduler:go_default_library",
"//pkg/scheduler/algorithmprovider:go_default_library",
"//pkg/util/labels:go_default_library",
"//staging/src/k8s.io/api/apps/v1:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",

22
test/integration/daemonset/daemonset_test.go
View File

@@ -46,7 +46,6 @@ import (
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/controller/daemon"
"k8s.io/kubernetes/pkg/scheduler"
"k8s.io/kubernetes/pkg/scheduler/algorithmprovider"
labelsutil "k8s.io/kubernetes/pkg/util/labels"
"k8s.io/kubernetes/test/integration/framework"
)
@@ -84,10 +83,7 @@ func setupScheduler(
t *testing.T,
cs clientset.Interface,
informerFactory informers.SharedInformerFactory,
) (restoreFeatureGates func()) {
// Enable Features.
restoreFeatureGates = algorithmprovider.ApplyFeatureGates()
) {
eventBroadcaster := events.NewBroadcaster(&events.EventSinkImpl{
Interface: cs.EventsV1beta1().Events(""),
})
@@ -444,7 +440,7 @@ func TestOneNodeDaemonLaunchesPod(t *testing.T) {
defer cancel()
// Start Scheduler
defer setupScheduler(ctx, t, clientset, informers)()
setupScheduler(ctx, t, clientset, informers)
informers.Start(ctx.Done())
go dc.Run(5, ctx.Done())
@@ -486,7 +482,7 @@ func TestSimpleDaemonSetLaunchesPods(t *testing.T) {
go dc.Run(5, ctx.Done())
// Start Scheduler
defer setupScheduler(ctx, t, clientset, informers)()
setupScheduler(ctx, t, clientset, informers)
ds := newDaemonSet("foo", ns.Name)
ds.Spec.UpdateStrategy = *strategy
@@ -522,7 +518,7 @@ func TestDaemonSetWithNodeSelectorLaunchesPods(t *testing.T) {
go dc.Run(5, ctx.Done())
// Start Scheduler
defer setupScheduler(ctx, t, clientset, informers)()
setupScheduler(ctx, t, clientset, informers)
ds := newDaemonSet("foo", ns.Name)
ds.Spec.UpdateStrategy = *strategy
@@ -591,7 +587,7 @@ func TestNotReadyNodeDaemonDoesLaunchPod(t *testing.T) {
go dc.Run(5, ctx.Done())
// Start Scheduler
defer setupScheduler(ctx, t, clientset, informers)()
setupScheduler(ctx, t, clientset, informers)
ds := newDaemonSet("foo", ns.Name)
ds.Spec.UpdateStrategy = *strategy
@@ -638,7 +634,7 @@ func TestInsufficientCapacityNode(t *testing.T) {
go dc.Run(5, ctx.Done())
// Start Scheduler
defer setupScheduler(ctx, t, clientset, informers)()
setupScheduler(ctx, t, clientset, informers)
ds := newDaemonSet("foo", ns.Name)
ds.Spec.Template.Spec = resourcePodSpec("", "120M", "75m")
@@ -701,7 +697,7 @@ func TestLaunchWithHashCollision(t *testing.T) {
go dc.Run(5, ctx.Done())
// Start Scheduler
defer setupScheduler(ctx, t, clientset, informers)()
setupScheduler(ctx, t, clientset, informers)
// Create single node
_, err := nodeClient.Create(newNode("single-node", nil))
@@ -811,7 +807,7 @@ func TestTaintedNode(t *testing.T) {
go dc.Run(5, ctx.Done())
// Start Scheduler
defer setupScheduler(ctx, t, clientset, informers)()
setupScheduler(ctx, t, clientset, informers)
ds := newDaemonSet("foo", ns.Name)
ds.Spec.UpdateStrategy = *strategy
@@ -876,7 +872,7 @@ func TestUnschedulableNodeDaemonDoesLaunchPod(t *testing.T) {
go dc.Run(5, ctx.Done())
// Start Scheduler
defer setupScheduler(ctx, t, clientset, informers)()
setupScheduler(ctx, t, clientset, informers)
ds := newDaemonSet("foo", ns.Name)
ds.Spec.UpdateStrategy = *strategy