From 5918869ed6c2d5b5d6c4db5be77f846b6a7b5422 Mon Sep 17 00:00:00 2001 From: Dave Chen Date: Thu, 8 Jul 2021 13:25:53 +0800 Subject: [PATCH] Revert 103327: "kube-scheduler: ensure the default config output of --write-to-config is usable" We don't need to maually disable all the default plugins anymore Signed-off-by: Dave Chen dave.chen@arm.com --- cmd/kube-scheduler/app/options/configfile.go | 24 -------------------- 1 file changed, 24 deletions(-) diff --git a/cmd/kube-scheduler/app/options/configfile.go b/cmd/kube-scheduler/app/options/configfile.go index ea0c9644271..384e86fb480 100644 --- a/cmd/kube-scheduler/app/options/configfile.go +++ b/cmd/kube-scheduler/app/options/configfile.go @@ -87,30 +87,6 @@ func LogOrWriteConfig(fileName string, cfg *config.KubeSchedulerConfiguration, c } cfg.Profiles = completedProfiles - if len(fileName) > 0 { - // Since the default component config lists all the default plugins as enabled - // without disabling them, we must explicitly disable all the plugins for each - // extension point using the "*" expression to ensure that the generated config - // file is usable - disabledPlugins := []config.Plugin{{Name: "*"}} - for i := range cfg.Profiles { - if cfg.Profiles[i].Plugins == nil { - continue - } - cfg.Profiles[i].Plugins.QueueSort.Disabled = disabledPlugins - cfg.Profiles[i].Plugins.PreFilter.Disabled = disabledPlugins - cfg.Profiles[i].Plugins.Filter.Disabled = disabledPlugins - cfg.Profiles[i].Plugins.PostFilter.Disabled = disabledPlugins - cfg.Profiles[i].Plugins.PreScore.Disabled = disabledPlugins - cfg.Profiles[i].Plugins.Score.Disabled = disabledPlugins - cfg.Profiles[i].Plugins.Reserve.Disabled = disabledPlugins - cfg.Profiles[i].Plugins.Permit.Disabled = disabledPlugins - cfg.Profiles[i].Plugins.PreBind.Disabled = disabledPlugins - cfg.Profiles[i].Plugins.Bind.Disabled = disabledPlugins - cfg.Profiles[i].Plugins.PostBind.Disabled = disabledPlugins - } - } - buf, err := encodeConfig(cfg) if err != nil { return err