Merge pull request kubernetes#88728 from notpad/feature/scheduler_e2e_test

Add test for kube-scheduler command setup

Author: k8s-ci-robot

cmd/kube-scheduler/app/BUILD

@@ -3,6 +3,7 @@ package(default_visibility = ["//visibility:public"])
 load(
     "@io_bazel_rules_go//go:def.bzl",
     "go_library",
+    "go_test",
 )
 
 go_library(
@@ -65,3 +66,15 @@ filegroup(
     ],
     tags = ["automanaged"],
 )
+
+go_test(
+    name = "go_default_test",
+    srcs = ["server_test.go"],
+    embed = [":go_default_library"],
+    deps = [
+        "//cmd/kube-scheduler/app/options:go_default_library",
+        "//pkg/scheduler/apis/config:go_default_library",
+        "//vendor/github.com/google/go-cmp/cmp:go_default_library",
+        "//vendor/github.com/spf13/pflag:go_default_library",
+    ],
+)

cmd/kube-scheduler/app/server.go

@@ -119,33 +119,29 @@ func runCommand(cmd *cobra.Command, args []string, opts *options.Options, regist
 	verflag.PrintAndExitIfRequested()
 	utilflag.PrintFlags(cmd.Flags())
 
-	if len(args) != 0 {
-		fmt.Fprint(os.Stderr, "arguments are not supported\n")
-	}
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 
-	if errs := opts.Validate(); len(errs) > 0 {
-		return utilerrors.NewAggregate(errs)
+	cc, sched, err := Setup(ctx, args, opts, registryOptions...)
+	if err != nil {
+		return err
 	}
 
 	if len(opts.WriteConfigTo) > 0 {
-		c := &schedulerserverconfig.Config{}
-		if err := opts.ApplyTo(c); err != nil {
-			return err
-		}
-		if err := options.WriteConfigFile(opts.WriteConfigTo, &c.ComponentConfig); err != nil {
+		if err := options.WriteConfigFile(opts.WriteConfigTo, &cc.ComponentConfig); err != nil {
 			return err
 		}
 		klog.Infof("Wrote configuration to: %s\n", opts.WriteConfigTo)
 		return nil
 	}
 
-	c, err := opts.Config()
-	if err != nil {
-		return err
-	}
+	return Run(ctx, cc, sched)
+}
 
-	// Get the completed config
-	cc := c.Complete()
+// Run executes the scheduler based on the given configuration. It only returns on error or when context is done.
+func Run(ctx context.Context, cc *schedulerserverconfig.CompletedConfig, sched *scheduler.Scheduler) error {
+	// To help debugging, immediately log version
+	klog.V(1).Infof("Starting Kubernetes Scheduler version %+v", version.Get())
 
 	// Configz registration.
 	if cz, err := configz.New("componentconfig"); err == nil {
@@ -154,45 +150,6 @@ func runCommand(cmd *cobra.Command, args []string, opts *options.Options, regist
 		return fmt.Errorf("unable to register configz: %s", err)
 	}
 
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	return Run(ctx, cc, registryOptions...)
-}
-
-// Run executes the scheduler based on the given configuration. It only returns on error or when context is done.
-func Run(ctx context.Context, cc schedulerserverconfig.CompletedConfig, outOfTreeRegistryOptions ...Option) error {
-	// To help debugging, immediately log version
-	klog.V(1).Infof("Starting Kubernetes Scheduler version %+v", version.Get())
-
-	outOfTreeRegistry := make(framework.Registry)
-	for _, option := range outOfTreeRegistryOptions {
-		if err := option(outOfTreeRegistry); err != nil {
-			return err
-		}
-	}
-
-	recorderFactory := getRecorderFactory(&cc)
-	// Create the scheduler.
-	sched, err := scheduler.New(cc.Client,
-		cc.InformerFactory,
-		cc.PodInformer,
-		recorderFactory,
-		ctx.Done(),
-		scheduler.WithProfiles(cc.ComponentConfig.Profiles...),
-		scheduler.WithAlgorithmSource(cc.ComponentConfig.AlgorithmSource),
-		scheduler.WithPreemptionDisabled(cc.ComponentConfig.DisablePreemption),
-		scheduler.WithPercentageOfNodesToScore(cc.ComponentConfig.PercentageOfNodesToScore),
-		scheduler.WithBindTimeoutSeconds(cc.ComponentConfig.BindTimeoutSeconds),
-		scheduler.WithFrameworkOutOfTreeRegistry(outOfTreeRegistry),
-		scheduler.WithPodMaxBackoffSeconds(cc.ComponentConfig.PodMaxBackoffSeconds),
-		scheduler.WithPodInitialBackoffSeconds(cc.ComponentConfig.PodInitialBackoffSeconds),
-		scheduler.WithExtenders(cc.ComponentConfig.Extenders...),
-	)
-	if err != nil {
-		return err
-	}
-
 	// Prepare the event broadcaster.
 	if cc.Broadcaster != nil && cc.EventClient != nil {
 		cc.Broadcaster.StartRecordingToSink(ctx.Done())
@@ -340,3 +297,52 @@ func WithPlugin(name string, factory framework.PluginFactory) Option {
 		return registry.Register(name, factory)
 	}
 }
+
+// Setup creates a completed config and a scheduler based on the command args and options
+func Setup(ctx context.Context, args []string, opts *options.Options, outOfTreeRegistryOptions ...Option) (*schedulerserverconfig.CompletedConfig, *scheduler.Scheduler, error) {
+	if len(args) != 0 {
+		fmt.Fprint(os.Stderr, "arguments are not supported\n")
+	}
+
+	if errs := opts.Validate(); len(errs) > 0 {
+		return nil, nil, utilerrors.NewAggregate(errs)
+	}
+
+	c, err := opts.Config()
+	if err != nil {
+		return nil, nil, err
+	}
+
+	// Get the completed config
+	cc := c.Complete()
+
+	outOfTreeRegistry := make(framework.Registry)
+	for _, option := range outOfTreeRegistryOptions {
+		if err := option(outOfTreeRegistry); err != nil {
+			return nil, nil, err
+		}
+	}
+
+	recorderFactory := getRecorderFactory(&cc)
+	// Create the scheduler.
+	sched, err := scheduler.New(cc.Client,
+		cc.InformerFactory,
+		cc.PodInformer,
+		recorderFactory,
+		ctx.Done(),
+		scheduler.WithProfiles(cc.ComponentConfig.Profiles...),
+		scheduler.WithAlgorithmSource(cc.ComponentConfig.AlgorithmSource),
+		scheduler.WithPreemptionDisabled(cc.ComponentConfig.DisablePreemption),
+		scheduler.WithPercentageOfNodesToScore(cc.ComponentConfig.PercentageOfNodesToScore),
+		scheduler.WithBindTimeoutSeconds(cc.ComponentConfig.BindTimeoutSeconds),
+		scheduler.WithFrameworkOutOfTreeRegistry(outOfTreeRegistry),
+		scheduler.WithPodMaxBackoffSeconds(cc.ComponentConfig.PodMaxBackoffSeconds),
+		scheduler.WithPodInitialBackoffSeconds(cc.ComponentConfig.PodInitialBackoffSeconds),
+		scheduler.WithExtenders(cc.ComponentConfig.Extenders...),
+	)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	return &cc, sched, nil
+}