Skip to content

Commit d31dcec

Browse files
ahg-gahg-g
committed
cleanup unused scheduler functions/files
1 parent 9ff3b52 commit d31dcec

File tree

14 files changed

+10
-83
lines changed

14 files changed

+10
-83
lines changed

‎cmd/kube-scheduler/app/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ go_library(
1414
"//cmd/kube-scheduler/app/options:go_default_library",
1515
"//pkg/api/legacyscheme:go_default_library",
1616
"//pkg/scheduler:go_default_library",
17-
"//pkg/scheduler/algorithmprovider:go_default_library",
1817
"//pkg/scheduler/apis/config:go_default_library",
1918
"//pkg/scheduler/framework/v1alpha1:go_default_library",
2019
"//pkg/scheduler/metrics:go_default_library",

‎cmd/kube-scheduler/app/server.go‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ import (
5555
"k8s.io/kubernetes/cmd/kube-scheduler/app/options"
5656
"k8s.io/kubernetes/pkg/api/legacyscheme"
5757
"k8s.io/kubernetes/pkg/scheduler"
58-
"k8s.io/kubernetes/pkg/scheduler/algorithmprovider"
5958
kubeschedulerconfig "k8s.io/kubernetes/pkg/scheduler/apis/config"
6059
framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
6160
"k8s.io/kubernetes/pkg/scheduler/metrics"
@@ -146,10 +145,6 @@ func runCommand(cmd *cobra.Command, args []string, opts *options.Options, regist
146145
// Get the completed config
147146
cc := c.Complete()
148147

149-
// Apply algorithms based on feature gates.
150-
// TODO: make configurable?
151-
algorithmprovider.ApplyFeatureGates()
152-
153148
// Configz registration.
154149
if cz, err := configz.New("componentconfig"); err == nil {
155150
cz.Set(cc.ComponentConfig)

‎cmd/kube-scheduler/app/testing/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ go_library(
99
"//cmd/kube-scheduler/app:go_default_library",
1010
"//cmd/kube-scheduler/app/config:go_default_library",
1111
"//cmd/kube-scheduler/app/options:go_default_library",
12-
"//pkg/scheduler/algorithmprovider/defaults:go_default_library",
1312
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
1413
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
1514
"//staging/src/k8s.io/client-go/rest:go_default_library",

‎cmd/kube-scheduler/app/testing/testserver.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ import (
3232
"k8s.io/kubernetes/cmd/kube-scheduler/app"
3333
kubeschedulerconfig "k8s.io/kubernetes/cmd/kube-scheduler/app/config"
3434
"k8s.io/kubernetes/cmd/kube-scheduler/app/options"
35-
36-
// import DefaultProvider
37-
_ "k8s.io/kubernetes/pkg/scheduler/algorithmprovider/defaults"
3835
)
3936

4037
// TearDownFunc is to be called to tear down a test server.

‎pkg/scheduler/algorithmprovider/BUILD‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,6 @@ filegroup(
7272

7373
filegroup(
7474
name = "all-srcs",
75-
srcs = [
76-
":package-srcs",
77-
"//pkg/scheduler/algorithmprovider/defaults:all-srcs",
78-
],
75+
srcs = [":package-srcs"],
7976
tags = ["automanaged"],
8077
)

‎pkg/scheduler/algorithmprovider/defaults/BUILD‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎pkg/scheduler/algorithmprovider/defaults/defaults.go‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎pkg/scheduler/algorithmprovider/registry.go‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,3 @@ func applyFeatureGates(config *Config) {
173173
config.FrameworkPlugins.Score.Enabled = append(config.FrameworkPlugins.Score.Enabled, s)
174174
}
175175
}
176-
177-
// ApplyFeatureGates applies algorithm by feature gates.
178-
// TODO(ahg-g): DEPRECATED, remove.
179-
func ApplyFeatureGates() func() {
180-
return func() {}
181-
}

‎test/integration/daemonset/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ go_test(
2020
"//pkg/controller:go_default_library",
2121
"//pkg/controller/daemon:go_default_library",
2222
"//pkg/scheduler:go_default_library",
23-
"//pkg/scheduler/algorithmprovider:go_default_library",
2423
"//pkg/util/labels:go_default_library",
2524
"//staging/src/k8s.io/api/apps/v1:go_default_library",
2625
"//staging/src/k8s.io/api/core/v1:go_default_library",

‎test/integration/daemonset/daemonset_test.go‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ import (
4646
"k8s.io/kubernetes/pkg/controller"
4747
"k8s.io/kubernetes/pkg/controller/daemon"
4848
"k8s.io/kubernetes/pkg/scheduler"
49-
"k8s.io/kubernetes/pkg/scheduler/algorithmprovider"
5049
labelsutil "k8s.io/kubernetes/pkg/util/labels"
5150
"k8s.io/kubernetes/test/integration/framework"
5251
)
@@ -84,10 +83,7 @@ func setupScheduler(
8483
t *testing.T,
8584
cs clientset.Interface,
8685
informerFactory informers.SharedInformerFactory,
87-
) (restoreFeatureGates func()) {
88-
// Enable Features.
89-
restoreFeatureGates = algorithmprovider.ApplyFeatureGates()
90-
86+
) {
9187
eventBroadcaster := events.NewBroadcaster(&events.EventSinkImpl{
9288
Interface: cs.EventsV1beta1().Events(""),
9389
})
@@ -444,7 +440,7 @@ func TestOneNodeDaemonLaunchesPod(t *testing.T) {
444440
defer cancel()
445441

446442
// Start Scheduler
447-
defer setupScheduler(ctx, t, clientset, informers)()
443+
setupScheduler(ctx, t, clientset, informers)
448444

449445
informers.Start(ctx.Done())
450446
go dc.Run(5, ctx.Done())
@@ -486,7 +482,7 @@ func TestSimpleDaemonSetLaunchesPods(t *testing.T) {
486482
go dc.Run(5, ctx.Done())
487483

488484
// Start Scheduler
489-
defer setupScheduler(ctx, t, clientset, informers)()
485+
setupScheduler(ctx, t, clientset, informers)
490486

491487
ds := newDaemonSet("foo", ns.Name)
492488
ds.Spec.UpdateStrategy = *strategy
@@ -522,7 +518,7 @@ func TestDaemonSetWithNodeSelectorLaunchesPods(t *testing.T) {
522518
go dc.Run(5, ctx.Done())
523519

524520
// Start Scheduler
525-
defer setupScheduler(ctx, t, clientset, informers)()
521+
setupScheduler(ctx, t, clientset, informers)
526522

527523
ds := newDaemonSet("foo", ns.Name)
528524
ds.Spec.UpdateStrategy = *strategy
@@ -591,7 +587,7 @@ func TestNotReadyNodeDaemonDoesLaunchPod(t *testing.T) {
591587
go dc.Run(5, ctx.Done())
592588

593589
// Start Scheduler
594-
defer setupScheduler(ctx, t, clientset, informers)()
590+
setupScheduler(ctx, t, clientset, informers)
595591

596592
ds := newDaemonSet("foo", ns.Name)
597593
ds.Spec.UpdateStrategy = *strategy
@@ -638,7 +634,7 @@ func TestInsufficientCapacityNode(t *testing.T) {
638634
go dc.Run(5, ctx.Done())
639635

640636
// Start Scheduler
641-
defer setupScheduler(ctx, t, clientset, informers)()
637+
setupScheduler(ctx, t, clientset, informers)
642638

643639
ds := newDaemonSet("foo", ns.Name)
644640
ds.Spec.Template.Spec = resourcePodSpec("", "120M", "75m")
@@ -701,7 +697,7 @@ func TestLaunchWithHashCollision(t *testing.T) {
701697
go dc.Run(5, ctx.Done())
702698

703699
// Start Scheduler
704-
defer setupScheduler(ctx, t, clientset, informers)()
700+
setupScheduler(ctx, t, clientset, informers)
705701

706702
// Create single node
707703
_, err := nodeClient.Create(newNode("single-node", nil))
@@ -811,7 +807,7 @@ func TestTaintedNode(t *testing.T) {
811807
go dc.Run(5, ctx.Done())
812808

813809
// Start Scheduler
814-
defer setupScheduler(ctx, t, clientset, informers)()
810+
setupScheduler(ctx, t, clientset, informers)
815811

816812
ds := newDaemonSet("foo", ns.Name)
817813
ds.Spec.UpdateStrategy = *strategy
@@ -876,7 +872,7 @@ func TestUnschedulableNodeDaemonDoesLaunchPod(t *testing.T) {
876872
go dc.Run(5, ctx.Done())
877873

878874
// Start Scheduler
879-
defer setupScheduler(ctx, t, clientset, informers)()
875+
setupScheduler(ctx, t, clientset, informers)
880876

881877
ds := newDaemonSet("foo", ns.Name)
882878
ds.Spec.UpdateStrategy = *strategy

0 commit comments

Comments
 (0)