Skip to content

Commit

Permalink
Merge pull request kubernetes#18475 from ravisantoshgudimetla/fix-sch…
Browse files Browse the repository at this point in the history
…eduler-config-flag

Automatic merge from submit-queue.

UPSTREAM: 59386: Scheduler - not able to read from config file if configmap not found

Scheduler is not able to read from config file if configmap is not found.

Upstream PR: kubernetes#59386

xref: https://bugzilla.redhat.com/show_bug.cgi?id=1540785

/cc @aveshagarwal  @sjenning

Origin-commit: a1c2561ddfcb6c8d54c0188317dfabcbd25eca62
  • Loading branch information
k8s-publishing-bot committed Feb 27, 2018
2 parents 2e77d77 + 56202e2 commit 6d3a7d2
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 6d3a7d2

Please sign in to comment.