Merge pull request #59386 from ravisantoshgudimetla/fix-scheduler-config-file

Automatic merge from submit-queue (batch tested with PRs 59165, 59386). 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>. Scheduler - not able to read from config file if configmap is not found **What this PR does / why we need it**: As of now, we are not able to read config file if configmap is not present. As of now, the only way to make it work is to enable legacy mode which should not be the case. xref: https://bugzilla.redhat.com/show_bug.cgi?id=1540785 **Release note**: ```release-note Scheduler should be able to read from config file if configmap is not present. ``` /cc @bsalamat @ironcladlou

Merge pull request #59386 from ravisantoshgudimetla/fix-scheduler-config-file
f611b322 · Kubernetes Submit Queue · GitHub · db23481c · 34d35f13 · f611b322
Unverified Commit f611b322 authored Feb 05, 2018 by Kubernetes Submit Queue Committed by GitHub Feb 05, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

server.go cmd/kube-scheduler/app/server.go +1 -1

No files found.
--- a/cmd/kube-scheduler/app/server.go
+++ b/cmd/kube-scheduler/app/server.go
@@ -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{