From d31dcecd2005283c44efb36a1fa6920755ff4c98 Mon Sep 17 00:00:00 2001 From: Abdullah Gharaibeh Date: Fri, 3 Jan 2020 15:30:47 -0500 Subject: [PATCH] cleanup unused scheduler functions/files --- cmd/kube-scheduler/app/BUILD | 1 - cmd/kube-scheduler/app/server.go | 5 ----- cmd/kube-scheduler/app/testing/BUILD | 1 - cmd/kube-scheduler/app/testing/testserver.go | 3 --- pkg/scheduler/algorithmprovider/BUILD | 5 +---- .../algorithmprovider/defaults/BUILD | 22 ------------------- .../algorithmprovider/defaults/defaults.go | 19 ---------------- pkg/scheduler/algorithmprovider/registry.go | 6 ----- test/integration/daemonset/BUILD | 1 - test/integration/daemonset/daemonset_test.go | 22 ++++++++----------- test/integration/util/BUILD | 1 - test/integration/util/util.go | 3 --- test/integration/volumescheduling/BUILD | 1 - test/integration/volumescheduling/util.go | 3 --- 14 files changed, 10 insertions(+), 83 deletions(-) delete mode 100644 pkg/scheduler/algorithmprovider/defaults/BUILD delete mode 100644 pkg/scheduler/algorithmprovider/defaults/defaults.go diff --git a/cmd/kube-scheduler/app/BUILD b/cmd/kube-scheduler/app/BUILD index 203554fe605..af0bbbb4910 100644 --- a/cmd/kube-scheduler/app/BUILD +++ b/cmd/kube-scheduler/app/BUILD @@ -14,7 +14,6 @@ go_library( "//cmd/kube-scheduler/app/options:go_default_library", "//pkg/api/legacyscheme:go_default_library", "//pkg/scheduler:go_default_library", - "//pkg/scheduler/algorithmprovider:go_default_library", "//pkg/scheduler/apis/config:go_default_library", "//pkg/scheduler/framework/v1alpha1:go_default_library", "//pkg/scheduler/metrics:go_default_library", diff --git a/cmd/kube-scheduler/app/server.go b/cmd/kube-scheduler/app/server.go index 12d7908819c..dfa3a4713dd 100644 --- a/cmd/kube-scheduler/app/server.go +++ b/cmd/kube-scheduler/app/server.go @@ -55,7 +55,6 @@ import ( "k8s.io/kubernetes/cmd/kube-scheduler/app/options" "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/scheduler" - "k8s.io/kubernetes/pkg/scheduler/algorithmprovider" kubeschedulerconfig "k8s.io/kubernetes/pkg/scheduler/apis/config" framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" "k8s.io/kubernetes/pkg/scheduler/metrics" @@ -146,10 +145,6 @@ func runCommand(cmd *cobra.Command, args []string, opts *options.Options, regist // Get the completed config cc := c.Complete() - // Apply algorithms based on feature gates. - // TODO: make configurable? - algorithmprovider.ApplyFeatureGates() - // Configz registration. if cz, err := configz.New("componentconfig"); err == nil { cz.Set(cc.ComponentConfig) diff --git a/cmd/kube-scheduler/app/testing/BUILD b/cmd/kube-scheduler/app/testing/BUILD index 5e4a38bd2ea..8df856388b1 100644 --- a/cmd/kube-scheduler/app/testing/BUILD +++ b/cmd/kube-scheduler/app/testing/BUILD @@ -9,7 +9,6 @@ go_library( "//cmd/kube-scheduler/app:go_default_library", "//cmd/kube-scheduler/app/config:go_default_library", "//cmd/kube-scheduler/app/options:go_default_library", - "//pkg/scheduler/algorithmprovider/defaults:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", diff --git a/cmd/kube-scheduler/app/testing/testserver.go b/cmd/kube-scheduler/app/testing/testserver.go index 63c24003e5d..e643872f732 100644 --- a/cmd/kube-scheduler/app/testing/testserver.go +++ b/cmd/kube-scheduler/app/testing/testserver.go @@ -32,9 +32,6 @@ import ( "k8s.io/kubernetes/cmd/kube-scheduler/app" kubeschedulerconfig "k8s.io/kubernetes/cmd/kube-scheduler/app/config" "k8s.io/kubernetes/cmd/kube-scheduler/app/options" - - // import DefaultProvider - _ "k8s.io/kubernetes/pkg/scheduler/algorithmprovider/defaults" ) // TearDownFunc is to be called to tear down a test server. diff --git a/pkg/scheduler/algorithmprovider/BUILD b/pkg/scheduler/algorithmprovider/BUILD index d1743eb8565..f583539cac8 100644 --- a/pkg/scheduler/algorithmprovider/BUILD +++ b/pkg/scheduler/algorithmprovider/BUILD @@ -72,9 +72,6 @@ filegroup( filegroup( name = "all-srcs", - srcs = [ - ":package-srcs", - "//pkg/scheduler/algorithmprovider/defaults:all-srcs", - ], + srcs = [":package-srcs"], tags = ["automanaged"], ) diff --git a/pkg/scheduler/algorithmprovider/defaults/BUILD b/pkg/scheduler/algorithmprovider/defaults/BUILD deleted file mode 100644 index e6c5c13dbf7..00000000000 --- a/pkg/scheduler/algorithmprovider/defaults/BUILD +++ /dev/null @@ -1,22 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = ["defaults.go"], - importpath = "k8s.io/kubernetes/pkg/scheduler/algorithmprovider/defaults", - visibility = ["//visibility:public"], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], - visibility = ["//visibility:public"], -) diff --git a/pkg/scheduler/algorithmprovider/defaults/defaults.go b/pkg/scheduler/algorithmprovider/defaults/defaults.go deleted file mode 100644 index 3b24b4b5a88..00000000000 --- a/pkg/scheduler/algorithmprovider/defaults/defaults.go +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright 2014 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package defaults - -// TODO(ahg-g): remove this pkg. diff --git a/pkg/scheduler/algorithmprovider/registry.go b/pkg/scheduler/algorithmprovider/registry.go index 367ec3e275d..cd38604f9f2 100644 --- a/pkg/scheduler/algorithmprovider/registry.go +++ b/pkg/scheduler/algorithmprovider/registry.go @@ -173,9 +173,3 @@ func applyFeatureGates(config *Config) { config.FrameworkPlugins.Score.Enabled = append(config.FrameworkPlugins.Score.Enabled, s) } } - -// ApplyFeatureGates applies algorithm by feature gates. -// TODO(ahg-g): DEPRECATED, remove. -func ApplyFeatureGates() func() { - return func() {} -} diff --git a/test/integration/daemonset/BUILD b/test/integration/daemonset/BUILD index 134bb5d8f39..9c917afb504 100644 --- a/test/integration/daemonset/BUILD +++ b/test/integration/daemonset/BUILD @@ -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", diff --git a/test/integration/daemonset/daemonset_test.go b/test/integration/daemonset/daemonset_test.go index 8a1d8f81b4a..5c0add82f92 100644 --- a/test/integration/daemonset/daemonset_test.go +++ b/test/integration/daemonset/daemonset_test.go @@ -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 diff --git a/test/integration/util/BUILD b/test/integration/util/BUILD index 57971e11b70..b998d29714e 100644 --- a/test/integration/util/BUILD +++ b/test/integration/util/BUILD @@ -15,7 +15,6 @@ go_library( deps = [ "//pkg/api/legacyscheme:go_default_library", "//pkg/scheduler:go_default_library", - "//pkg/scheduler/algorithmprovider/defaults:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/client-go/informers:go_default_library", "//staging/src/k8s.io/client-go/informers/core/v1:go_default_library", diff --git a/test/integration/util/util.go b/test/integration/util/util.go index bda61cb2a90..c06b0cdbe48 100644 --- a/test/integration/util/util.go +++ b/test/integration/util/util.go @@ -29,9 +29,6 @@ import ( "k8s.io/klog" "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/scheduler" - - // import DefaultProvider - _ "k8s.io/kubernetes/pkg/scheduler/algorithmprovider/defaults" "k8s.io/kubernetes/test/integration/framework" ) diff --git a/test/integration/volumescheduling/BUILD b/test/integration/volumescheduling/BUILD index ffa88937d3e..9eb967183ab 100644 --- a/test/integration/volumescheduling/BUILD +++ b/test/integration/volumescheduling/BUILD @@ -57,7 +57,6 @@ go_library( "//pkg/api/legacyscheme:go_default_library", "//pkg/api/v1/pod:go_default_library", "//pkg/scheduler:go_default_library", - "//pkg/scheduler/algorithmprovider/defaults: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", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", diff --git a/test/integration/volumescheduling/util.go b/test/integration/volumescheduling/util.go index 2e32705fca3..6e640acdae2 100644 --- a/test/integration/volumescheduling/util.go +++ b/test/integration/volumescheduling/util.go @@ -38,9 +38,6 @@ import ( podutil "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/scheduler" "k8s.io/kubernetes/test/integration/framework" - - // Install "DefaultProvider" algorithprovider - _ "k8s.io/kubernetes/pkg/scheduler/algorithmprovider/defaults" ) type testContext struct {