diff --git a/cmd/kube-scheduler/app/options/configfile.go b/cmd/kube-scheduler/app/options/configfile.go index ee2fd7cb396..9b5fa9e3489 100644 --- a/cmd/kube-scheduler/app/options/configfile.go +++ b/cmd/kube-scheduler/app/options/configfile.go @@ -90,12 +90,6 @@ func LogOrWriteConfig(logger klog.Logger, fileName string, cfg *config.KubeSched return err } - defaultPluginString := "Plugins Enabled By Default:" - for _, v := range configv1.GetDefaultPlugins.MultiPoint.Enabled { - name := v.Name - defaultPluginString += "\n" + "\t" + name - } - buf.WriteString(defaultPluginString) if loggerV.Enabled() { loggerV.Info("Using component config", "config", buf.String()) } diff --git a/pkg/scheduler/apis/config/v1/default_plugins.go b/pkg/scheduler/apis/config/v1/default_plugins.go index fb4650e1713..509cb57a274 100644 --- a/pkg/scheduler/apis/config/v1/default_plugins.go +++ b/pkg/scheduler/apis/config/v1/default_plugins.go @@ -26,8 +26,6 @@ import ( "k8s.io/utils/ptr" ) -var GetDefaultPlugins = getDefaultPlugins() - // getDefaultPlugins returns the default set of plugins. func getDefaultPlugins() *v1.Plugins { plugins := &v1.Plugins{ diff --git a/pkg/scheduler/framework/runtime/framework.go b/pkg/scheduler/framework/runtime/framework.go index 4d4588ef5b8..e5940709a6f 100644 --- a/pkg/scheduler/framework/runtime/framework.go +++ b/pkg/scheduler/framework/runtime/framework.go @@ -355,6 +355,34 @@ func NewFramework(ctx context.Context, r Registry, profile *config.KubeScheduler options.captureProfile(outputProfile) } + for _, e := range f.getExtensionPoints(profile.Plugins) { + plugins := reflect.ValueOf(e.slicePtr).Elem() + pluginType := plugins.Type().Elem() + loggerV := logger.V(2) + + enabledSet := newOrderedSet() + for _, plugin := range e.plugins.Enabled { + enabledSet.insert(plugin.Name) + } + + disabledSet := sets.New[string]() + for _, disabledPlugin := range e.plugins.Disabled { + disabledSet.Insert(disabledPlugin.Name) + } + + if disabledSet.Has("*") { + continue + } + + for _, ep := range profile.Plugins.MultiPoint.Enabled { + if !enabledSet.has(ep.Name) { + enabledSet.insert(ep.Name) + } + } + + loggerV.Info("Plugins enabled for", "extension", pluginType, "plugins", enabledSet.list) + } + f.setInstrumentedPlugins() return f, nil }