github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #55311 from CaoShuFeng/scheduler-trivial

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 53747, 54528, 55279, 55251, 55311). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

[trivil] fix comment in kube-scheduler

**Release note**:
```
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-11-08 19:31:15 -08:00 committed by GitHub
commit 4886a7091b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/cmd/kube-scheduler/app/server.go
View File

@ -258,7 +258,7 @@ func (o *Options) loadConfigFromFile(file string) (*componentconfig.KubeSchedule
return o.loadConfig(data)
}
// loadConfig decodes data as a KubeProxyConfiguration object.
// loadConfig decodes data as a KubeSchedulerConfiguration object.
func (o *Options) loadConfig(data []byte) (*componentconfig.KubeSchedulerConfiguration, error) {
configObj, gvk, err := o.codecs.UniversalDecoder().Decode(data, nil, nil)
if err != nil {