From 49ea5afaf7c84a0107feee3616827569e0197026 Mon Sep 17 00:00:00 2001 From: Aldo Culquicondor Date: Tue, 5 Nov 2019 14:35:02 -0500 Subject: [PATCH] Write scheduler configuration from config file Signed-off-by: Aldo Culquicondor --- cmd/kube-scheduler/app/server.go | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/cmd/kube-scheduler/app/server.go b/cmd/kube-scheduler/app/server.go index 84604746604..753c72efe2d 100644 --- a/cmd/kube-scheduler/app/server.go +++ b/cmd/kube-scheduler/app/server.go @@ -123,22 +123,24 @@ func runCommand(cmd *cobra.Command, args []string, opts *options.Options, regist } if errs := opts.Validate(); len(errs) > 0 { - fmt.Fprintf(os.Stderr, "%v\n", utilerrors.NewAggregate(errs)) - os.Exit(1) + return utilerrors.NewAggregate(errs) } if len(opts.WriteConfigTo) > 0 { - if err := options.WriteConfigFile(opts.WriteConfigTo, &opts.ComponentConfig); err != nil { - fmt.Fprintf(os.Stderr, "%v\n", err) - os.Exit(1) + c := &schedulerserverconfig.Config{} + if err := opts.ApplyTo(c); err != nil { + return err + } + if err := options.WriteConfigFile(opts.WriteConfigTo, &c.ComponentConfig); err != nil { + return err } klog.Infof("Wrote configuration to: %s\n", opts.WriteConfigTo) + return nil } c, err := opts.Config() if err != nil { - fmt.Fprintf(os.Stderr, "%v\n", err) - os.Exit(1) + return err } // Get the completed config