a07022ae8a
Changes in pkg/apis/scheduler reflecting the changes from staging. The weights of following priority plugins were increased: - TaintTolerations - NodeAffinity - InterPodAffinity as they're user facing priorities and they should be more influential when compared to default plugins which don't have any user say. xref: https://github.com/kubernetes/enhancements/pull/2850
465 lines
12 KiB
Go
465 lines
12 KiB
Go
/*
|
|
Copyright 2017 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 v1beta3
|
|
|
|
import (
|
|
"k8s.io/kube-scheduler/config/v1beta3"
|
|
"testing"
|
|
|
|
"github.com/google/go-cmp/cmp"
|
|
"k8s.io/apiserver/pkg/util/feature"
|
|
"k8s.io/component-base/featuregate"
|
|
featuregatetesting "k8s.io/component-base/featuregate/testing"
|
|
"k8s.io/kubernetes/pkg/features"
|
|
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/names"
|
|
"k8s.io/utils/pointer"
|
|
)
|
|
|
|
func TestApplyFeatureGates(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
features map[featuregate.Feature]bool
|
|
wantConfig *v1beta3.Plugins
|
|
}{
|
|
{
|
|
name: "Feature gates disabled",
|
|
wantConfig: &v1beta3.Plugins{
|
|
QueueSort: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: names.PrioritySort},
|
|
},
|
|
},
|
|
PreFilter: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: names.NodeResourcesFit},
|
|
{Name: names.NodePorts},
|
|
{Name: names.VolumeRestrictions},
|
|
{Name: names.PodTopologySpread},
|
|
{Name: names.InterPodAffinity},
|
|
{Name: names.VolumeBinding},
|
|
{Name: names.NodeAffinity},
|
|
},
|
|
},
|
|
Filter: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: names.NodeUnschedulable},
|
|
{Name: names.NodeName},
|
|
{Name: names.TaintToleration},
|
|
{Name: names.NodeAffinity},
|
|
{Name: names.NodePorts},
|
|
{Name: names.NodeResourcesFit},
|
|
{Name: names.VolumeRestrictions},
|
|
{Name: names.EBSLimits},
|
|
{Name: names.GCEPDLimits},
|
|
{Name: names.NodeVolumeLimits},
|
|
{Name: names.AzureDiskLimits},
|
|
{Name: names.VolumeBinding},
|
|
{Name: names.VolumeZone},
|
|
{Name: names.PodTopologySpread},
|
|
{Name: names.InterPodAffinity},
|
|
},
|
|
},
|
|
PostFilter: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: names.DefaultPreemption},
|
|
},
|
|
},
|
|
PreScore: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: names.InterPodAffinity},
|
|
{Name: names.PodTopologySpread},
|
|
{Name: names.TaintToleration},
|
|
{Name: names.NodeAffinity},
|
|
},
|
|
},
|
|
Score: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: names.NodeResourcesBalancedAllocation, Weight: pointer.Int32Ptr(1)},
|
|
{Name: names.ImageLocality, Weight: pointer.Int32Ptr(1)},
|
|
{Name: names.NodeResourcesFit, Weight: pointer.Int32Ptr(1)},
|
|
{Name: names.InterPodAffinity, Weight: pointer.Int32Ptr(2)},
|
|
{Name: names.NodeAffinity, Weight: pointer.Int32Ptr(2)},
|
|
{Name: names.PodTopologySpread, Weight: pointer.Int32Ptr(2)},
|
|
{Name: names.TaintToleration, Weight: pointer.Int32Ptr(3)},
|
|
},
|
|
},
|
|
Reserve: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: names.VolumeBinding},
|
|
},
|
|
},
|
|
PreBind: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: names.VolumeBinding},
|
|
},
|
|
},
|
|
Bind: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: names.DefaultBinder},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "DefaultPodTopologySpread disabled",
|
|
features: map[featuregate.Feature]bool{
|
|
features.DefaultPodTopologySpread: false,
|
|
},
|
|
wantConfig: &v1beta3.Plugins{
|
|
QueueSort: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: names.PrioritySort},
|
|
},
|
|
},
|
|
PreFilter: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: names.NodeResourcesFit},
|
|
{Name: names.NodePorts},
|
|
{Name: names.VolumeRestrictions},
|
|
{Name: names.PodTopologySpread},
|
|
{Name: names.InterPodAffinity},
|
|
{Name: names.VolumeBinding},
|
|
{Name: names.NodeAffinity},
|
|
},
|
|
},
|
|
Filter: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: names.NodeUnschedulable},
|
|
{Name: names.NodeName},
|
|
{Name: names.TaintToleration},
|
|
{Name: names.NodeAffinity},
|
|
{Name: names.NodePorts},
|
|
{Name: names.NodeResourcesFit},
|
|
{Name: names.VolumeRestrictions},
|
|
{Name: names.EBSLimits},
|
|
{Name: names.GCEPDLimits},
|
|
{Name: names.NodeVolumeLimits},
|
|
{Name: names.AzureDiskLimits},
|
|
{Name: names.VolumeBinding},
|
|
{Name: names.VolumeZone},
|
|
{Name: names.PodTopologySpread},
|
|
{Name: names.InterPodAffinity},
|
|
},
|
|
},
|
|
PostFilter: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: names.DefaultPreemption},
|
|
},
|
|
},
|
|
PreScore: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: names.InterPodAffinity},
|
|
{Name: names.PodTopologySpread},
|
|
{Name: names.TaintToleration},
|
|
{Name: names.NodeAffinity},
|
|
{Name: names.SelectorSpread},
|
|
},
|
|
},
|
|
Score: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: names.NodeResourcesBalancedAllocation, Weight: pointer.Int32Ptr(1)},
|
|
{Name: names.ImageLocality, Weight: pointer.Int32Ptr(1)},
|
|
{Name: names.NodeResourcesFit, Weight: pointer.Int32Ptr(1)},
|
|
{Name: names.InterPodAffinity, Weight: pointer.Int32Ptr(2)},
|
|
{Name: names.NodeAffinity, Weight: pointer.Int32Ptr(2)},
|
|
{Name: names.PodTopologySpread, Weight: pointer.Int32Ptr(2)},
|
|
{Name: names.TaintToleration, Weight: pointer.Int32Ptr(3)},
|
|
{Name: names.SelectorSpread, Weight: pointer.Int32Ptr(1)},
|
|
},
|
|
},
|
|
Reserve: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: names.VolumeBinding},
|
|
},
|
|
},
|
|
PreBind: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: names.VolumeBinding},
|
|
},
|
|
},
|
|
Bind: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: names.DefaultBinder},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
for _, test := range tests {
|
|
t.Run(test.name, func(t *testing.T) {
|
|
for k, v := range test.features {
|
|
defer featuregatetesting.SetFeatureGateDuringTest(t, feature.DefaultFeatureGate, k, v)()
|
|
}
|
|
|
|
gotConfig := getDefaultPlugins()
|
|
if diff := cmp.Diff(test.wantConfig, gotConfig); diff != "" {
|
|
t.Errorf("unexpected config diff (-want, +got): %s", diff)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestMergePlugins(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
customPlugins *v1beta3.Plugins
|
|
defaultPlugins *v1beta3.Plugins
|
|
expectedPlugins *v1beta3.Plugins
|
|
}{
|
|
{
|
|
name: "AppendCustomPlugin",
|
|
customPlugins: &v1beta3.Plugins{
|
|
Filter: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: "CustomPlugin"},
|
|
},
|
|
},
|
|
},
|
|
defaultPlugins: &v1beta3.Plugins{
|
|
Filter: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: "DefaultPlugin1"},
|
|
{Name: "DefaultPlugin2"},
|
|
},
|
|
},
|
|
},
|
|
expectedPlugins: &v1beta3.Plugins{
|
|
Filter: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: "DefaultPlugin1"},
|
|
{Name: "DefaultPlugin2"},
|
|
{Name: "CustomPlugin"},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "InsertAfterDefaultPlugins2",
|
|
customPlugins: &v1beta3.Plugins{
|
|
Filter: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: "CustomPlugin"},
|
|
{Name: "DefaultPlugin2"},
|
|
},
|
|
Disabled: []v1beta3.Plugin{
|
|
{Name: "DefaultPlugin2"},
|
|
},
|
|
},
|
|
},
|
|
defaultPlugins: &v1beta3.Plugins{
|
|
Filter: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: "DefaultPlugin1"},
|
|
{Name: "DefaultPlugin2"},
|
|
},
|
|
},
|
|
},
|
|
expectedPlugins: &v1beta3.Plugins{
|
|
Filter: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: "DefaultPlugin1"},
|
|
{Name: "CustomPlugin"},
|
|
{Name: "DefaultPlugin2"},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "InsertBeforeAllPlugins",
|
|
customPlugins: &v1beta3.Plugins{
|
|
Filter: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: "CustomPlugin"},
|
|
{Name: "DefaultPlugin1"},
|
|
{Name: "DefaultPlugin2"},
|
|
},
|
|
Disabled: []v1beta3.Plugin{
|
|
{Name: "*"},
|
|
},
|
|
},
|
|
},
|
|
defaultPlugins: &v1beta3.Plugins{
|
|
Filter: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: "DefaultPlugin1"},
|
|
{Name: "DefaultPlugin2"},
|
|
},
|
|
},
|
|
},
|
|
expectedPlugins: &v1beta3.Plugins{
|
|
Filter: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: "CustomPlugin"},
|
|
{Name: "DefaultPlugin1"},
|
|
{Name: "DefaultPlugin2"},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "ReorderDefaultPlugins",
|
|
customPlugins: &v1beta3.Plugins{
|
|
Filter: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: "DefaultPlugin2"},
|
|
{Name: "DefaultPlugin1"},
|
|
},
|
|
Disabled: []v1beta3.Plugin{
|
|
{Name: "*"},
|
|
},
|
|
},
|
|
},
|
|
defaultPlugins: &v1beta3.Plugins{
|
|
Filter: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: "DefaultPlugin1"},
|
|
{Name: "DefaultPlugin2"},
|
|
},
|
|
},
|
|
},
|
|
expectedPlugins: &v1beta3.Plugins{
|
|
Filter: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: "DefaultPlugin2"},
|
|
{Name: "DefaultPlugin1"},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "ApplyNilCustomPlugin",
|
|
customPlugins: nil,
|
|
defaultPlugins: &v1beta3.Plugins{
|
|
Filter: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: "DefaultPlugin1"},
|
|
{Name: "DefaultPlugin2"},
|
|
},
|
|
},
|
|
},
|
|
expectedPlugins: &v1beta3.Plugins{
|
|
Filter: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: "DefaultPlugin1"},
|
|
{Name: "DefaultPlugin2"},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "CustomPluginOverrideDefaultPlugin",
|
|
customPlugins: &v1beta3.Plugins{
|
|
Filter: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: "Plugin1", Weight: pointer.Int32Ptr(2)},
|
|
{Name: "Plugin3", Weight: pointer.Int32Ptr(3)},
|
|
},
|
|
},
|
|
},
|
|
defaultPlugins: &v1beta3.Plugins{
|
|
Filter: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: "Plugin1"},
|
|
{Name: "Plugin2"},
|
|
{Name: "Plugin3"},
|
|
},
|
|
},
|
|
},
|
|
expectedPlugins: &v1beta3.Plugins{
|
|
Filter: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: "Plugin1", Weight: pointer.Int32Ptr(2)},
|
|
{Name: "Plugin2"},
|
|
{Name: "Plugin3", Weight: pointer.Int32Ptr(3)},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "OrderPreserveAfterOverride",
|
|
customPlugins: &v1beta3.Plugins{
|
|
Filter: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: "Plugin2", Weight: pointer.Int32Ptr(2)},
|
|
{Name: "Plugin1", Weight: pointer.Int32Ptr(1)},
|
|
},
|
|
},
|
|
},
|
|
defaultPlugins: &v1beta3.Plugins{
|
|
Filter: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: "Plugin1"},
|
|
{Name: "Plugin2"},
|
|
{Name: "Plugin3"},
|
|
},
|
|
},
|
|
},
|
|
expectedPlugins: &v1beta3.Plugins{
|
|
Filter: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: "Plugin1", Weight: pointer.Int32Ptr(1)},
|
|
{Name: "Plugin2", Weight: pointer.Int32Ptr(2)},
|
|
{Name: "Plugin3"},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "RepeatedCustomPlugin",
|
|
customPlugins: &v1beta3.Plugins{
|
|
Filter: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: "Plugin1"},
|
|
{Name: "Plugin2", Weight: pointer.Int32Ptr(2)},
|
|
{Name: "Plugin3"},
|
|
{Name: "Plugin2", Weight: pointer.Int32Ptr(4)},
|
|
},
|
|
},
|
|
},
|
|
defaultPlugins: &v1beta3.Plugins{
|
|
Filter: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: "Plugin1"},
|
|
{Name: "Plugin2"},
|
|
{Name: "Plugin3"},
|
|
},
|
|
},
|
|
},
|
|
expectedPlugins: &v1beta3.Plugins{
|
|
Filter: v1beta3.PluginSet{
|
|
Enabled: []v1beta3.Plugin{
|
|
{Name: "Plugin1"},
|
|
{Name: "Plugin2", Weight: pointer.Int32Ptr(4)},
|
|
{Name: "Plugin3"},
|
|
{Name: "Plugin2", Weight: pointer.Int32Ptr(2)},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
for _, test := range tests {
|
|
t.Run(test.name, func(t *testing.T) {
|
|
test.defaultPlugins = mergePlugins(test.defaultPlugins, test.customPlugins)
|
|
if d := cmp.Diff(test.expectedPlugins, test.defaultPlugins); d != "" {
|
|
t.Fatalf("plugins mismatch (-want +got):\n%s", d)
|
|
}
|
|
})
|
|
}
|
|
}
|