github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-25 12:17:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into ipv6

Browse Source
This commit is contained in:
steveperry-53
2018-02-14 10:45:27 -08:00
parent a2256c060e 79b1589657
commit cc7cea74ae
1713 changed files with 57475 additions and 19395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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{