From 52e24a02effa31176b18d15c28408834bee5e787 Mon Sep 17 00:00:00 2001 From: myeunee Date: Mon, 9 Sep 2024 00:34:03 +0900 Subject: [PATCH 1/5] Clean up unnecessary else block and redundant variable assignment This PR removes an unnecessary else block and eliminates a redundant variable assignment to improve code readability. --- cmd/kube-scheduler/app/server.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/kube-scheduler/app/server.go b/cmd/kube-scheduler/app/server.go index 7b08b119b4b..c788be0282c 100644 --- a/cmd/kube-scheduler/app/server.go +++ b/cmd/kube-scheduler/app/server.go @@ -133,13 +133,12 @@ for more information about scheduling and the kube-scheduler component.`, // runCommand runs the scheduler. func runCommand(cmd *cobra.Command, opts *options.Options, registryOptions ...Option) error { verflag.PrintAndExitIfRequested() - fg := opts.ComponentGlobalsRegistry.FeatureGateFor(utilversion.DefaultKubeComponent) // Activate logging as soon as possible, after that // show flags with the final logging configuration. - if err := logsapi.ValidateAndApply(opts.Logs, fg); err != nil { + if err := logsapi.ValidateAndApply(opts.Logs, opts.ComponentGlobalsRegistry.FeatureGateFor(utilversion.DefaultKubeComponent)); err != nil { fmt.Fprintf(os.Stderr, "%v\n", err) os.Exit(1) - } + } cliflag.PrintFlags(cmd.Flags()) ctx, cancel := context.WithCancel(context.Background()) @@ -169,11 +168,12 @@ func Run(ctx context.Context, cc *schedulerserverconfig.CompletedConfig, sched * logger.Info("Golang settings", "GOGC", os.Getenv("GOGC"), "GOMAXPROCS", os.Getenv("GOMAXPROCS"), "GOTRACEBACK", os.Getenv("GOTRACEBACK")) // Configz registration. - if cz, err := configz.New("componentconfig"); err == nil { - cz.Set(cc.ComponentConfig) - } else { + cz, err := configz.New("componentconfig") + if err != nil { return fmt.Errorf("unable to register configz: %s", err) } + cz.Set(cc.ComponentConfig) + // Start events processing pipeline. cc.EventBroadcaster.StartRecordingToSink(ctx.Done()) From 051a1e99c1b0cb08ed4aef877494eeafb0e17003 Mon Sep 17 00:00:00 2001 From: myeunee Date: Tue, 10 Sep 2024 01:23:05 +0900 Subject: [PATCH 2/5] Update server.go Refactor: Removed unnecessary else block and redundant variable assignment --- cmd/kube-scheduler/app/server.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmd/kube-scheduler/app/server.go b/cmd/kube-scheduler/app/server.go index c788be0282c..3e01dbf75ef 100644 --- a/cmd/kube-scheduler/app/server.go +++ b/cmd/kube-scheduler/app/server.go @@ -133,12 +133,13 @@ for more information about scheduling and the kube-scheduler component.`, // runCommand runs the scheduler. func runCommand(cmd *cobra.Command, opts *options.Options, registryOptions ...Option) error { verflag.PrintAndExitIfRequested() + fg := opts.ComponentGlobalsRegistry.FeatureGateFor(utilversion.DefaultKubeComponent) // Activate logging as soon as possible, after that // show flags with the final logging configuration. - if err := logsapi.ValidateAndApply(opts.Logs, opts.ComponentGlobalsRegistry.FeatureGateFor(utilversion.DefaultKubeComponent)); err != nil { + if err := logsapi.ValidateAndApply(opts.Logs, fg); err != nil { fmt.Fprintf(os.Stderr, "%v\n", err) os.Exit(1) - } + } cliflag.PrintFlags(cmd.Flags()) ctx, cancel := context.WithCancel(context.Background()) From b390ae24d01a1e8b14a45221d1ccf3723a2412aa Mon Sep 17 00:00:00 2001 From: myeunee Date: Thu, 3 Oct 2024 17:02:36 +0900 Subject: [PATCH 3/5] Apply gofmt formatting to server.go --- cmd/kube-scheduler/app/server.go | 1 - 1 file changed, 1 deletion(-) diff --git a/cmd/kube-scheduler/app/server.go b/cmd/kube-scheduler/app/server.go index 3e01dbf75ef..b040c8c0516 100644 --- a/cmd/kube-scheduler/app/server.go +++ b/cmd/kube-scheduler/app/server.go @@ -174,7 +174,6 @@ func Run(ctx context.Context, cc *schedulerserverconfig.CompletedConfig, sched * return fmt.Errorf("unable to register configz: %s", err) } cz.Set(cc.ComponentConfig) - // Start events processing pipeline. cc.EventBroadcaster.StartRecordingToSink(ctx.Done()) From 2faaedbe39fe2cd993f63932dd84e35e10bbc96f Mon Sep 17 00:00:00 2001 From: myeunee Date: Wed, 30 Oct 2024 04:53:51 +0900 Subject: [PATCH 4/5] Refactor error handling for configz initialization Improved code readability and limited variable scope as per reviewer's suggestion. --- cmd/kube-scheduler/app/server.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/kube-scheduler/app/server.go b/cmd/kube-scheduler/app/server.go index b040c8c0516..62b6c798289 100644 --- a/cmd/kube-scheduler/app/server.go +++ b/cmd/kube-scheduler/app/server.go @@ -169,8 +169,7 @@ func Run(ctx context.Context, cc *schedulerserverconfig.CompletedConfig, sched * logger.Info("Golang settings", "GOGC", os.Getenv("GOGC"), "GOMAXPROCS", os.Getenv("GOMAXPROCS"), "GOTRACEBACK", os.Getenv("GOTRACEBACK")) // Configz registration. - cz, err := configz.New("componentconfig") - if err != nil { + if cz, err := configz.New("componentconfig"); err != nil { return fmt.Errorf("unable to register configz: %s", err) } cz.Set(cc.ComponentConfig) From 9cc65ce872fecd4bae76bf1cf0e3ded50c2980f3 Mon Sep 17 00:00:00 2001 From: myeunee Date: Wed, 30 Oct 2024 06:31:06 +0900 Subject: [PATCH 5/5] Restrict cz variable scope within else clause --- cmd/kube-scheduler/app/server.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/kube-scheduler/app/server.go b/cmd/kube-scheduler/app/server.go index 62b6c798289..888f0d81137 100644 --- a/cmd/kube-scheduler/app/server.go +++ b/cmd/kube-scheduler/app/server.go @@ -171,8 +171,9 @@ func Run(ctx context.Context, cc *schedulerserverconfig.CompletedConfig, sched * // Configz registration. if cz, err := configz.New("componentconfig"); err != nil { return fmt.Errorf("unable to register configz: %s", err) + } else { + cz.Set(cc.ComponentConfig) } - cz.Set(cc.ComponentConfig) // Start events processing pipeline. cc.EventBroadcaster.StartRecordingToSink(ctx.Done())