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

Merge pull request #113231 from Huang-Wei/cleanup-sched-main-test

Browse Source 
cleanup scheduler server_test.go
This commit is contained in:
Kubernetes Prow Robot 2022-10-21 00:45:51 -07:00 committed by GitHub
commit fe9d04763b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/kube-scheduler/app/server_test.go
View File

@ -198,7 +198,7 @@ profiles:
// out-of-tree plugin config v1 // out-of-tree plugin config v1
outOfTreePluginConfigFilev1 := filepath.Join(tmpDir, "outOfTreePluginv1.yaml") outOfTreePluginConfigFilev1 := filepath.Join(tmpDir, "outOfTreePluginv1.yaml")
if err := os.WriteFile(outOfTreePluginConfigFilev1, []byte(fmt.Sprintf(` if err := os.WriteFile(outOfTreePluginConfigFilev1, []byte(fmt.Sprintf(`
apiVersion: kubescheduler.config.k8s.io/v1beta3 apiVersion: kubescheduler.config.k8s.io/v1
kind: KubeSchedulerConfiguration kind: KubeSchedulerConfiguration
clientConnection: clientConnection:
kubeconfig: '%s' kubeconfig: '%s'
@ -321,20 +321,7 @@ leaderElection:
"--feature-gates=VolumeCapacityPriority=true", "--feature-gates=VolumeCapacityPriority=true",
}, },
wantPlugins: map[string]*config.Plugins{ wantPlugins: map[string]*config.Plugins{
"default-scheduler": func() *config.Plugins { "default-scheduler": defaults.ExpandedPluginsV1,
plugins := &config.Plugins{
QueueSort: defaults.ExpandedPluginsV1beta3.QueueSort,
PreFilter: defaults.ExpandedPluginsV1beta3.PreFilter,
Filter: defaults.ExpandedPluginsV1beta3.Filter,
PostFilter: defaults.ExpandedPluginsV1beta3.PostFilter,
PreScore: defaults.ExpandedPluginsV1beta3.PreScore,
Score: defaults.ExpandedPluginsV1beta3.Score,
Bind: defaults.ExpandedPluginsV1beta3.Bind,
PreBind: defaults.ExpandedPluginsV1beta3.PreBind,
Reserve: defaults.ExpandedPluginsV1beta3.Reserve,
}
return plugins
}(),
}, },
restoreFeatures: map[featuregate.Feature]bool{ restoreFeatures: map[featuregate.Feature]bool{
features.VolumeCapacityPriority: false, features.VolumeCapacityPriority: false,
@ -346,7 +333,7 @@ leaderElection:
"--kubeconfig", configKubeconfig, "--kubeconfig", configKubeconfig,
}, },
wantPlugins: map[string]*config.Plugins{ wantPlugins: map[string]*config.Plugins{
"default-scheduler": defaults.ExpandedPluginsV1beta3, "default-scheduler": defaults.ExpandedPluginsV1,
}, },
}, },
{ {