Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bug 1874920: Revert "bug 1874919: UPSTREAM: 94423: debugger scheduler plugin" #345

Merged
merged 1 commit into from
Sep 18, 2020
Merged

bug 1874920: Revert "bug 1874919: UPSTREAM: 94423: debugger scheduler plugin" #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions cmd/kube-scheduler/app/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ profiles:
{Name: "PodTopologySpread"},
{Name: "InterPodAffinity"},
{Name: "VolumeBinding"},
{Name: "Debugger"},
},
"FilterPlugin": {
{Name: "NodeUnschedulable"},
Expand Down Expand Up @@ -291,7 +290,6 @@ profiles:
{Name: "PodTopologySpread"},
{Name: "InterPodAffinity"},
{Name: "VolumeBinding"},
{Name: "Debugger"},
},
"FilterPlugin": {
{Name: "NodeUnschedulable"},
Expand Down
1 change: 0 additions & 1 deletion pkg/scheduler/algorithmprovider/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ go_library(
deps = [
"//pkg/features:go_default_library",
"//pkg/scheduler/apis/config:go_default_library",
"//pkg/scheduler/framework/plugins/debugger:go_default_library",
"//pkg/scheduler/framework/plugins/defaultbinder:go_default_library",
"//pkg/scheduler/framework/plugins/defaultpreemption:go_default_library",
"//pkg/scheduler/framework/plugins/imagelocality:go_default_library",
Expand Down
13 changes: 9 additions & 4 deletions pkg/scheduler/algorithmprovider/registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ limitations under the License.
package algorithmprovider

import (
"fmt"
"sort"
"strings"

utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/klog/v2"
"k8s.io/kubernetes/pkg/features"
schedulerapi "k8s.io/kubernetes/pkg/scheduler/apis/config"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/debugger"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultbinder"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultpreemption"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/imagelocality"
Expand Down Expand Up @@ -66,7 +66,13 @@ func NewRegistry() Registry {

// ListAlgorithmProviders lists registered algorithm providers.
func ListAlgorithmProviders() string {
return fmt.Sprintf("%s | %s", ClusterAutoscalerProvider, schedulerapi.SchedulerDefaultProviderName)
r := NewRegistry()
var providers []string
for k := range r {
providers = append(providers, k)
}
sort.Strings(providers)
return strings.Join(providers, " | ")
}

func getDefaultConfig() *schedulerapi.Plugins {
Expand All @@ -83,7 +89,6 @@ func getDefaultConfig() *schedulerapi.Plugins {
{Name: podtopologyspread.Name},
{Name: interpodaffinity.Name},
{Name: volumebinding.Name},
{Name: debugger.Name},
},
},
Filter: &schedulerapi.PluginSet{
Expand Down
4 changes: 0 additions & 4 deletions pkg/scheduler/algorithmprovider/registry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import (
featuregatetesting "k8s.io/component-base/featuregate/testing"
"k8s.io/kubernetes/pkg/features"
schedulerapi "k8s.io/kubernetes/pkg/scheduler/apis/config"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/debugger"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultbinder"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/imagelocality"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/interpodaffinity"
Expand Down Expand Up @@ -61,7 +60,6 @@ func TestClusterAutoscalerProvider(t *testing.T) {
{Name: podtopologyspread.Name},
{Name: interpodaffinity.Name},
{Name: volumebinding.Name},
{Name: debugger.Name},
},
},
Filter: &schedulerapi.PluginSet{
Expand Down Expand Up @@ -154,7 +152,6 @@ func TestApplyFeatureGates(t *testing.T) {
{Name: podtopologyspread.Name},
{Name: interpodaffinity.Name},
{Name: volumebinding.Name},
{Name: debugger.Name},
},
},
Filter: &schedulerapi.PluginSet{
Expand Down Expand Up @@ -235,7 +232,6 @@ func TestApplyFeatureGates(t *testing.T) {
{Name: podtopologyspread.Name},
{Name: interpodaffinity.Name},
{Name: volumebinding.Name},
{Name: debugger.Name},
},
},
Filter: &schedulerapi.PluginSet{
Expand Down
6 changes: 0 additions & 6 deletions pkg/scheduler/apis/config/testing/compatibility_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1384,7 +1384,6 @@ func TestAlgorithmProviderCompatibility(t *testing.T) {
{Name: "PodTopologySpread"},
{Name: "InterPodAffinity"},
{Name: "VolumeBinding"},
{Name: "Debugger"},
},
"FilterPlugin": {
{Name: "NodeUnschedulable"},
Expand Down Expand Up @@ -1455,7 +1454,6 @@ func TestAlgorithmProviderCompatibility(t *testing.T) {
{Name: "PodTopologySpread"},
{Name: "InterPodAffinity"},
{Name: "VolumeBinding"},
{Name: "Debugger"},
},
"FilterPlugin": {
{Name: "NodeUnschedulable"},
Expand Down Expand Up @@ -1546,7 +1544,6 @@ func TestPluginsConfigurationCompatibility(t *testing.T) {
{Name: "PodTopologySpread"},
{Name: "InterPodAffinity"},
{Name: "VolumeBinding"},
{Name: "Debugger"},
},
"FilterPlugin": {
{Name: "NodeUnschedulable"},
Expand Down Expand Up @@ -1744,7 +1741,6 @@ func TestPluginsConfigurationCompatibility(t *testing.T) {
{Name: "InterPodAffinity"},
{Name: "PodTopologySpread"},
{Name: "VolumeBinding"},
{Name: "Debugger"},
},
},
Filter: &config.PluginSet{
Expand Down Expand Up @@ -1831,7 +1827,6 @@ func TestPluginsConfigurationCompatibility(t *testing.T) {
{Name: "InterPodAffinity"},
{Name: "NodePorts"},
{Name: "NodeResourcesFit"},
{Name: "Debugger"},
},
Disabled: []config.Plugin{
{Name: "*"},
Expand Down Expand Up @@ -1896,7 +1891,6 @@ func TestPluginsConfigurationCompatibility(t *testing.T) {
{Name: "InterPodAffinity"},
{Name: "NodePorts"},
{Name: "NodeResourcesFit"},
{Name: "Debugger"},
},
"FilterPlugin": {
{Name: "InterPodAffinity"},
Expand Down
2 changes: 0 additions & 2 deletions pkg/scheduler/framework/plugins/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ go_library(
visibility = ["//visibility:public"],
deps = [
"//pkg/scheduler/apis/config:go_default_library",
"//pkg/scheduler/framework/plugins/debugger:go_default_library",
"//pkg/scheduler/framework/plugins/defaultbinder:go_default_library",
"//pkg/scheduler/framework/plugins/defaultpreemption:go_default_library",
"//pkg/scheduler/framework/plugins/imagelocality:go_default_library",
Expand Down Expand Up @@ -48,7 +47,6 @@ filegroup(
name = "all-srcs",
srcs = [
":package-srcs",
"//pkg/scheduler/framework/plugins/debugger:all-srcs",
"//pkg/scheduler/framework/plugins/defaultbinder:all-srcs",
"//pkg/scheduler/framework/plugins/defaultpreemption:all-srcs",
"//pkg/scheduler/framework/plugins/examples:all-srcs",
Expand Down
28 changes: 0 additions & 28 deletions pkg/scheduler/framework/plugins/debugger/BUILD
View file
Open in desktop

This file was deleted.

81 changes: 0 additions & 81 deletions pkg/scheduler/framework/plugins/debugger/debugger.go
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions pkg/scheduler/framework/plugins/registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ limitations under the License.
package plugins

import (
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/debugger"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultbinder"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultpreemption"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/imagelocality"
Expand Down Expand Up @@ -74,6 +73,5 @@ func NewInTreeRegistry() runtime.Registry {
queuesort.Name: queuesort.New,
defaultbinder.Name: defaultbinder.New,
defaultpreemption.Name: defaultpreemption.New,
debugger.Name: debugger.New,
}
}