Skip to content

Commit

Permalink
UPSTREAM: 59386: Scheduler - not able to read from config file if con…
Browse files Browse the repository at this point in the history
…figmap is not found

Origin-commit: 856bd0f01776f95a625527b4841a96cb6958ee51
  • Loading branch information
ravisantoshgudimetla authored and k8s-publishing-bot committed Feb 6, 2018
1 parent 2e77d77 commit 56202e2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion plugin/cmd/kube-scheduler/app/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ func (o *Options) applyDeprecatedHealthzPortToConfig() {
// 3. --algorithm-provider to use a named algorithm provider.
func (o *Options) applyDeprecatedAlgorithmSourceOptionsToConfig() {
switch {
case o.useLegacyPolicyConfig:
case o.useLegacyPolicyConfig || (len(o.policyConfigFile) > 0 && o.policyConfigMapName == ""):
o.config.AlgorithmSource = componentconfig.SchedulerAlgorithmSource{
Policy: &componentconfig.SchedulerPolicySource{
File: &componentconfig.SchedulerPolicyFileSource{
Expand Down

0 comments on commit 56202e2

Please sign in to comment.