github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-12 20:57:20 +00:00
Code Issues Projects Releases Wiki Activity

made scheduler cache and volume binder available when instantiating factories for default plugins

Browse Source
This commit is contained in:
Abdullah Gharaibeh
2019-10-10 16:21:29 -04:00
parent 0a98ccbcaf
commit 456df97745
11 changed files with 119 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/integration/scheduler/BUILD
View File

@@ -34,7 +34,6 @@ go_test(
"//pkg/scheduler/apis/config:go_default_library",
"//pkg/scheduler/apis/extender/v1:go_default_library",
"//pkg/scheduler/factory:go_default_library",
"//pkg/scheduler/framework/plugins:go_default_library",
"//pkg/scheduler/framework/v1alpha1:go_default_library",
"//pkg/scheduler/nodeinfo:go_default_library",
"//pkg/scheduler/testing:go_default_library",

26
test/integration/scheduler/framework_test.go
View File

@@ -461,7 +461,7 @@ func TestPreFilterPlugin(t *testing.T) {
// Create the master and the scheduler with the test plugin set.
context := initTestSchedulerForFrameworkTest(t, initTestMaster(t, "prefilter-plugin", nil), 2,
scheduler.WithFrameworkPlugins(plugins),
scheduler.WithFrameworkRegistry(registry))
scheduler.WithFrameworkDefaultRegistry(registry))
defer cleanupTest(t, context)
tests := []struct {
@@ -532,7 +532,7 @@ func TestScorePlugin(t *testing.T) {
context := initTestSchedulerForFrameworkTest(t, initTestMaster(t, "score-plugin", nil), 10,
scheduler.WithFrameworkPlugins(plugins),
scheduler.WithFrameworkRegistry(registry))
scheduler.WithFrameworkDefaultRegistry(registry))
defer cleanupTest(t, context)
for i, fail := range []bool{false, true} {
@@ -590,7 +590,7 @@ func TestNormalizeScorePlugin(t *testing.T) {
}
context := initTestSchedulerForFrameworkTest(t, initTestMaster(t, "score-plugin", nil), 10,
scheduler.WithFrameworkPlugins(plugins),
scheduler.WithFrameworkRegistry(registry))
scheduler.WithFrameworkDefaultRegistry(registry))
defer cleanupTest(t, context)
@@ -635,7 +635,7 @@ func TestReservePlugin(t *testing.T) {
// Create the master and the scheduler with the test plugin set.
context := initTestSchedulerForFrameworkTest(t, initTestMaster(t, "reserve-plugin", nil), 2,
scheduler.WithFrameworkPlugins(plugins),
scheduler.WithFrameworkRegistry(registry))
scheduler.WithFrameworkDefaultRegistry(registry))
defer cleanupTest(t, context)
for _, fail := range []bool{false, true} {
@@ -694,7 +694,7 @@ func TestPrebindPlugin(t *testing.T) {
context := initTestSchedulerForFrameworkTest(t, initTestMaster(t, "prebind-plugin", nil), 2,
scheduler.WithFrameworkPlugins(plugins),
scheduler.WithFrameworkPluginConfig(preBindPluginConfig),
scheduler.WithFrameworkRegistry(registry))
scheduler.WithFrameworkDefaultRegistry(registry))
defer cleanupTest(t, context)
tests := []struct {
@@ -789,7 +789,7 @@ func TestUnreservePlugin(t *testing.T) {
context := initTestSchedulerForFrameworkTest(t, initTestMaster(t, "unreserve-plugin", nil), 2,
scheduler.WithFrameworkPlugins(plugins),
scheduler.WithFrameworkPluginConfig(pluginConfig),
scheduler.WithFrameworkRegistry(registry))
scheduler.WithFrameworkDefaultRegistry(registry))
defer cleanupTest(t, context)
tests := []struct {
@@ -899,7 +899,7 @@ func TestBindPlugin(t *testing.T) {
context := initTestSchedulerWithOptions(t, testContext, false, nil, time.Second,
scheduler.WithFrameworkPlugins(plugins),
scheduler.WithFrameworkPluginConfig(pluginConfig),
scheduler.WithFrameworkRegistry(registry),
scheduler.WithFrameworkDefaultRegistry(registry),
scheduler.WithFrameworkConfigProducerRegistry(nil))
defer cleanupTest(t, context)
@@ -1072,7 +1072,7 @@ func TestPostBindPlugin(t *testing.T) {
context := initTestSchedulerForFrameworkTest(t, initTestMaster(t, "postbind-plugin", nil), 2,
scheduler.WithFrameworkPlugins(plugins),
scheduler.WithFrameworkPluginConfig(pluginConfig),
scheduler.WithFrameworkRegistry(registry))
scheduler.WithFrameworkDefaultRegistry(registry))
defer cleanupTest(t, context)
tests := []struct {
@@ -1147,7 +1147,7 @@ func TestPermitPlugin(t *testing.T) {
context := initTestSchedulerForFrameworkTest(t, initTestMaster(t, "permit-plugin", nil), 2,
scheduler.WithFrameworkPlugins(plugins),
scheduler.WithFrameworkPluginConfig(pluginConfig),
scheduler.WithFrameworkRegistry(registry))
scheduler.WithFrameworkDefaultRegistry(registry))
defer cleanupTest(t, context)
tests := []struct {
@@ -1253,7 +1253,7 @@ func TestCoSchedulingWithPermitPlugin(t *testing.T) {
context := initTestSchedulerForFrameworkTest(t, initTestMaster(t, "permit-plugin", nil), 2,
scheduler.WithFrameworkPlugins(plugins),
scheduler.WithFrameworkPluginConfig(pluginConfig),
scheduler.WithFrameworkRegistry(registry))
scheduler.WithFrameworkDefaultRegistry(registry))
defer cleanupTest(t, context)
tests := []struct {
@@ -1334,7 +1334,7 @@ func TestFilterPlugin(t *testing.T) {
// Create the master and the scheduler with the test plugin set.
context := initTestSchedulerForFrameworkTest(t, initTestMaster(t, "filter-plugin", nil), 2,
scheduler.WithFrameworkPlugins(plugins),
scheduler.WithFrameworkRegistry(registry))
scheduler.WithFrameworkDefaultRegistry(registry))
defer cleanupTest(t, context)
for _, fail := range []bool{false, true} {
@@ -1385,7 +1385,7 @@ func TestPostFilterPlugin(t *testing.T) {
// Create the master and the scheduler with the test plugin set.
context := initTestSchedulerForFrameworkTest(t, initTestMaster(t, "post-filter-plugin", nil), 2,
scheduler.WithFrameworkPlugins(plugins),
scheduler.WithFrameworkRegistry(registry))
scheduler.WithFrameworkDefaultRegistry(registry))
defer cleanupTest(t, context)
for _, fail := range []bool{false, true} {
@@ -1444,7 +1444,7 @@ func TestPreemptWithPermitPlugin(t *testing.T) {
context := initTestSchedulerForFrameworkTest(t, initTestMaster(t, "preempt-with-permit-plugin", nil), 0,
scheduler.WithFrameworkPlugins(plugins),
scheduler.WithFrameworkPluginConfig(pluginConfig),
scheduler.WithFrameworkRegistry(registry))
scheduler.WithFrameworkDefaultRegistry(registry))
defer cleanupTest(t, context)
// Add one node.

6
test/integration/scheduler/preemption_test.go
View File

@@ -40,7 +40,6 @@ import (
"k8s.io/kubernetes/pkg/apis/scheduling"
"k8s.io/kubernetes/pkg/scheduler"
schedulerconfig "k8s.io/kubernetes/pkg/scheduler/apis/config"
frameworkplugins "k8s.io/kubernetes/pkg/scheduler/framework/plugins"
framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
schedulernodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo"
"k8s.io/kubernetes/plugin/pkg/admission/priority"
@@ -124,8 +123,7 @@ var _ = framework.FilterPlugin(&tokenFilter{})
func TestPreemption(t *testing.T) {
// Initialize scheduler with a filter plugin.
var filter tokenFilter
registry := frameworkplugins.NewDefaultRegistry()
registry := make(framework.Registry)
registry.Register(filterPluginName, func(_ *runtime.Unknown, fh framework.FrameworkHandle) (framework.Plugin, error) {
return &filter, nil
})
@@ -149,7 +147,7 @@ func TestPreemption(t *testing.T) {
initTestMaster(t, "preemptiom", nil),
false, nil, time.Second,
scheduler.WithFrameworkPlugins(plugins),
scheduler.WithFrameworkRegistry(registry))
scheduler.WithFrameworkOutOfTreeRegistry(registry))
defer cleanupTest(t, context)
cs := context.clientSet