From 856bd0f01776f95a625527b4841a96cb6958ee51 Mon Sep 17 00:00:00 2001 From: ravisantoshgudimetla Date: Tue, 6 Feb 2018 11:48:29 -0500 Subject: [PATCH] UPSTREAM: 59386: Scheduler - not able to read from config file if configmap is not found --- .../k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/server.go b/vendor/k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/server.go index 4ec8016231f9..201e1dea4711 100644 --- a/vendor/k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/server.go +++ b/vendor/k8s.io/kubernetes/plugin/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{