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

scheduler deprecates non-csi plugins

Browse Source
This commit is contained in:
carlory 2024-04-24 15:59:17 +08:00
parent e59eceec48
commit a9f6374ba0
6 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/scheduler/apis/config/testing/defaults/defaults.go
View File

@ -34,10 +34,7 @@ var PluginsV1 = &config.Plugins{
{Name: names.NodePorts},
{Name: names.NodeResourcesFit, Weight: 1},
{Name: names.VolumeRestrictions},
{Name: names.EBSLimits},
{Name: names.GCEPDLimits},
{Name: names.NodeVolumeLimits},
{Name: names.AzureDiskLimits},
{Name: names.VolumeBinding},
{Name: names.VolumeZone},
{Name: names.PodTopologySpread, Weight: 2},
@ -68,10 +65,7 @@ var ExpandedPluginsV1 = &config.Plugins{
{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},
@ -87,10 +81,7 @@ var ExpandedPluginsV1 = &config.Plugins{
{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},

3
pkg/scheduler/apis/config/v1/default_plugins.go
View File

@ -40,10 +40,7 @@ func getDefaultPlugins() *v1.Plugins {
{Name: names.NodePorts},
{Name: names.NodeResourcesFit, Weight: ptr.To[int32](1)},
{Name: names.VolumeRestrictions},
{Name: names.EBSLimits},
{Name: names.GCEPDLimits},
{Name: names.NodeVolumeLimits},
{Name: names.AzureDiskLimits},
{Name: names.VolumeBinding},
{Name: names.VolumeZone},
{Name: names.PodTopologySpread, Weight: ptr.To[int32](2)},

6
pkg/scheduler/apis/config/v1/default_plugins_test.go
View File

@ -53,10 +53,7 @@ func TestApplyFeatureGates(t *testing.T) {
{Name: names.NodePorts},
{Name: names.NodeResourcesFit, Weight: ptr.To[int32](1)},
{Name: names.VolumeRestrictions},
{Name: names.EBSLimits},
{Name: names.GCEPDLimits},
{Name: names.NodeVolumeLimits},
{Name: names.AzureDiskLimits},
{Name: names.VolumeBinding},
{Name: names.VolumeZone},
{Name: names.PodTopologySpread, Weight: ptr.To[int32](2)},
@ -86,10 +83,7 @@ func TestApplyFeatureGates(t *testing.T) {
{Name: names.NodePorts},
{Name: names.NodeResourcesFit, Weight: ptr.To[int32](1)},
{Name: names.VolumeRestrictions},
{Name: names.EBSLimits},
{Name: names.GCEPDLimits},
{Name: names.NodeVolumeLimits},
{Name: names.AzureDiskLimits},
{Name: names.VolumeBinding},
{Name: names.VolumeZone},
{Name: names.PodTopologySpread, Weight: ptr.To[int32](2)},

3
pkg/scheduler/apis/config/v1/defaults_test.go
View File

@ -340,10 +340,7 @@ func TestSchedulerDefaults(t *testing.T) {
{Name: names.NodePorts},
{Name: names.NodeResourcesFit, Weight: ptr.To[int32](1)},
{Name: names.VolumeRestrictions},
{Name: names.EBSLimits},
{Name: names.GCEPDLimits},
{Name: names.NodeVolumeLimits},
{Name: names.AzureDiskLimits},
{Name: names.VolumeBinding},
{Name: names.VolumeZone},
{Name: names.PodTopologySpread, Weight: ptr.To[int32](2)},

7
pkg/scheduler/apis/config/validation/validation.go
View File

@ -101,7 +101,12 @@ type invalidPlugins struct {
var invalidPluginsByVersion = []invalidPlugins{
{
schemeGroupVersion: v1.SchemeGroupVersion.String(),
plugins: []string{},
plugins: []string{
"AzureDiskLimits",
"CinderLimits",
"EBSLimits",
"GCEPDLimits",
},
},
}

27
pkg/scheduler/apis/config/validation/validation_test.go
View File

@ -189,6 +189,12 @@ func TestValidateKubeSchedulerConfigurationV1(t *testing.T) {
validPlugins := validConfig.DeepCopy()
validPlugins.Profiles[0].Plugins.Score.Enabled = append(validPlugins.Profiles[0].Plugins.Score.Enabled, config.Plugin{Name: "PodTopologySpread", Weight: 2})
invalidPlugins := validConfig.DeepCopy()
invalidPlugins.Profiles[0].Plugins.Score.Enabled = append(invalidPlugins.Profiles[0].Plugins.Score.Enabled, config.Plugin{Name: "AzureDiskLimits"})
invalidPlugins.Profiles[0].Plugins.Score.Enabled = append(invalidPlugins.Profiles[0].Plugins.Score.Enabled, config.Plugin{Name: "CinderLimits"})
invalidPlugins.Profiles[0].Plugins.Score.Enabled = append(invalidPlugins.Profiles[0].Plugins.Score.Enabled, config.Plugin{Name: "EBSLimits"})
invalidPlugins.Profiles[0].Plugins.Score.Enabled = append(invalidPlugins.Profiles[0].Plugins.Score.Enabled, config.Plugin{Name: "GCEPDLimits"})
scenarios := map[string]struct {
config *config.KubeSchedulerConfiguration
wantErrs field.ErrorList
@ -367,6 +373,27 @@ func TestValidateKubeSchedulerConfigurationV1(t *testing.T) {
},
},
},
"invalid-plugins": {
config: invalidPlugins,
wantErrs: field.ErrorList{
&field.Error{
Type: field.ErrorTypeInvalid,
Field: "profiles[0].plugins.score.enabled[0]",
},
&field.Error{
Type: field.ErrorTypeInvalid,
Field: "profiles[0].plugins.score.enabled[1]",
},
&field.Error{
Type: field.ErrorTypeInvalid,
Field: "profiles[0].plugins.score.enabled[2]",
},
&field.Error{
Type: field.ErrorTypeInvalid,
Field: "profiles[0].plugins.score.enabled[3]",
},
},
},
"valid-plugins": {
config: validPlugins,
},