github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add compatibility tests for plugin config

Browse Source
This commit is contained in:
skilxn-go
2020-03-22 18:17:52 +08:00
parent d23310a40e
commit e0adb0ead9
4 changed files with 175 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
pkg/scheduler/apis/config/testing/compatibility_test.go
View File

@@ -25,6 +25,7 @@ import (
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/client-go/informers"
"k8s.io/client-go/kubernetes/fake"
@@ -1534,14 +1535,7 @@ func TestAlgorithmProviderCompatibility(t *testing.T) {
}
func TestPluginsConfigurationCompatibility(t *testing.T) {
testcases := []struct {
name string
plugins config.Plugins
wantPlugins map[string][]config.Plugin
}{
{
name: "No plugins specified",
wantPlugins: map[string][]config.Plugin{
defaultPlugins := map[string][]config.Plugin{
"QueueSortPlugin": {
{Name: "PrioritySort"},
},
@@ -1586,10 +1580,114 @@ func TestPluginsConfigurationCompatibility(t *testing.T) {
{Name: "PodTopologySpread", Weight: 1},
},
"BindPlugin": {{Name: "DefaultBinder"}},
}
testcases := []struct {
name string
plugins config.Plugins
wantPlugins map[string][]config.Plugin
pluginConfig []config.PluginConfig
}{
{
name: "default plugins",
wantPlugins: defaultPlugins,
},
{
name: "default plugins with customized plugin config",
wantPlugins: defaultPlugins,
pluginConfig: []config.PluginConfig{
{
Name: "NodeResourcesFit",
Args: runtime.Unknown{
Raw: []byte(`{
"ignoredResources": [
"foo",
"bar"
]
}`),
},
},
{
name: "Disable some default plugins",
Name: "PodTopologySpread",
Args: runtime.Unknown{
Raw: []byte(`{
"defaultConstraints": [
{
"maxSkew": 1,
"topologyKey": "foo",
"whenUnsatisfiable": "DoNotSchedule"
},
{
"maxSkew": 10,
"topologyKey": "bar",
"whenUnsatisfiable": "ScheduleAnyway"
}
]
}`),
},
},
{
Name: "RequestedToCapacityRatio",
Args: runtime.Unknown{
Raw: []byte(`{
"shape":[
"Utilization": 5,
"Score": 5
],
"resources":[
"Name": "cpu",
"Weight": 10
]
}`),
},
},
{
Name: "InterPodAffinity",
Args: runtime.Unknown{
Raw: []byte(`{
"HardPodAffinityWeight": 100
}`),
},
},
{
Name: "NodeLabel",
Args: runtime.Unknown{
Raw: []byte(`{
"presentLabels": [
"foo",
"bar"
],
"absentLabels": [
"apple"
],
"presentLabelsPreference": [
"dog"
],
"absentLabelsPreference": [
"cat"
]
}`),
},
},
{
Name: "ServiceAffinity",
Args: runtime.Unknown{
Raw: []byte(`{
affinityLabels: [
"foo",
"bar"
],
antiAffinityLabelsPreference: [
"disk",
"flash"
]
}`),
},
},
},
},
{
name: "disable some default plugins",
plugins: config.Plugins{
PreFilter: &config.PluginSet{
Disabled: []config.Plugin{
@@ -1648,7 +1746,7 @@ func TestPluginsConfigurationCompatibility(t *testing.T) {
},
},
{
name: "Reverse default plugins order with changing score weight",
name: "reverse default plugins order with changing score weight",
plugins: config.Plugins{
QueueSort: &config.PluginSet{
Enabled: []config.Plugin{
@@ -1779,6 +1877,15 @@ func TestPluginsConfigurationCompatibility(t *testing.T) {
scheduler.WithProfiles(config.KubeSchedulerProfile{
SchedulerName: v1.DefaultSchedulerName,
Plugins: &tc.plugins,
PluginConfig: tc.pluginConfig,
}),
scheduler.WithBuildFrameworkCapturer(func(p config.KubeSchedulerProfile) {
if p.SchedulerName != v1.DefaultSchedulerName {
t.Errorf("unexpected scheduler name (want %q, got %q)", v1.DefaultSchedulerName, p.SchedulerName)
}
if diff := cmp.Diff(tc.pluginConfig, p.PluginConfig); diff != "" {
t.Errorf("unexpected plugins diff (-want, +got): %s", diff)
}
}),
)
@@ -1786,7 +1893,7 @@ func TestPluginsConfigurationCompatibility(t *testing.T) {
t.Fatalf("Error constructing: %v", err)
}
defProf := sched.Profiles["default-scheduler"]
defProf := sched.Profiles[v1.DefaultSchedulerName]
gotPlugins := defProf.ListPlugins()
if diff := cmp.Diff(tc.wantPlugins, gotPlugins); diff != "" {
t.Errorf("unexpected plugins diff (-want, +got): %s", diff)

4
pkg/scheduler/factory.go
View File

@@ -108,9 +108,13 @@ type Configurator struct {
registry framework.Registry
nodeInfoSnapshot *internalcache.Snapshot
extenders []schedulerapi.Extender
frameworkCapturer FrameworkCapturer
}
func (c *Configurator) buildFramework(p schedulerapi.KubeSchedulerProfile) (framework.Framework, error) {
if c.frameworkCapturer != nil {
c.frameworkCapturer(p)
}
return framework.NewFramework(
c.registry,
p.Plugins,

2
pkg/scheduler/framework/plugins/queuesort/priority_sort.go
View File

@@ -45,6 +45,6 @@ func (pl *PrioritySort) Less(pInfo1, pInfo2 *framework.PodInfo) bool {
}
// New initializes a new plugin and returns it.
func New(plArgs *runtime.Unknown, handle framework.FrameworkHandle) (framework.Plugin, error) {
func New(_ *runtime.Unknown, handle framework.FrameworkHandle) (framework.Plugin, error) {
return &PrioritySort{}, nil
}

12
pkg/scheduler/scheduler.go
View File

@@ -134,6 +134,7 @@ type schedulerOptions struct {
frameworkOutOfTreeRegistry framework.Registry
profiles []schedulerapi.KubeSchedulerProfile
extenders []schedulerapi.Extender
frameworkCapturer FrameworkCapturer
}
// Option configures a Scheduler
@@ -204,6 +205,16 @@ func WithExtenders(e ...schedulerapi.Extender) Option {
}
}
// FrameworkCapturer is used for registering a notify function in building framework.
type FrameworkCapturer func(schedulerapi.KubeSchedulerProfile)
// WithBuildFrameworkCapturer sets a notify function for getting buildFramework details.
func WithBuildFrameworkCapturer(fc FrameworkCapturer) Option {
return func(o *schedulerOptions) {
o.frameworkCapturer = fc
}
}
var defaultSchedulerOptions = schedulerOptions{
profiles: []schedulerapi.KubeSchedulerProfile{
// Profiles' default plugins are set from the algorithm provider.
@@ -273,6 +284,7 @@ func New(client clientset.Interface,
registry: registry,
nodeInfoSnapshot: snapshot,
extenders: options.extenders,
frameworkCapturer: options.frameworkCapturer,
}
metrics.Register()