Merge pull request #86822 from ahg-g/ahg-cleanup

Cleanup deprecated scheduler functions/files
This commit is contained in:
Kubernetes Prow Robot 2020-01-05 12:37:41 -08:00 committed by GitHub
commit 10dc4a0c79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 10 additions and 83 deletions

View File

@ -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",

View File

@ -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)

View File

@ -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",

View File

@ -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.

View File

@ -72,9 +72,6 @@ filegroup(
filegroup(
name = "all-srcs",
srcs = [
":package-srcs",
"//pkg/scheduler/algorithmprovider/defaults:all-srcs",
],
srcs = [":package-srcs"],
tags = ["automanaged"],
)

View File

@ -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"],
)

View File

@ -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.

View File

@ -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() {}
}

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",

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

View File

@ -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",

View File

@ -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"
)

View File

@ -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",

View File

@ -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 {