Addressed changes as mentioned in PR comments

Signed-off-by: Horiodino <holiodin@gmail.com>

Author: Horiodino

catalogd/cmd/catalogd/main.go

@@ -17,6 +17,7 @@ limitations under the License.
 package main
 
 import (
+	"context"
 	"crypto/tls"
 	"flag"
 	"fmt"
@@ -96,24 +97,29 @@ func init() {
 }
 
 func main() {
-	cfg := &config{}
-	cmd := newRootCmd(cfg)
+	cmd := newRootCmd()
 	if err := cmd.Execute(); err != nil {
 		fmt.Fprintf(os.Stderr, "Error: %v\n", err)
 		os.Exit(1)
 	}
 }
 
-func newRootCmd(cfg *config) *cobra.Command {
+func newRootCmd() *cobra.Command {
+	cfg := &config{}
 	cmd := &cobra.Command{
 		Use:   "catalogd",
 		Short: "Catalogd is a Kubernetes operator for managing operator catalogs",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return run(cfg)
+			if err := validateTLSConfig(cfg); err != nil {
+				return err
+			}
+			cmd.SilenceUsage = true
+
+			return run(cfg, ctrl.SetupSignalHandler())
 		},
 	}
 
-	flags := cmd.PersistentFlags()
+	flags := cmd.Flags()
 	flags.StringVar(&cfg.metricsAddr, "metrics-bind-address", "", "The address for the metrics endpoint. Requires tls-cert and tls-key. (Default: ':7443')")
 	flags.StringVar(&cfg.probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
 	flags.StringVar(&cfg.pprofAddr, "pprof-bind-address", "0", "The address the pprof endpoint binds to. an empty string or 0 disables pprof")
@@ -147,7 +153,7 @@ func newVersionCmd() *cobra.Command {
 	}
 }
 
-func run(cfg *config) error {
+func run(cfg *config, ctx context.Context) error {
 	ctrl.SetLogger(textlogger.NewLogger(textlogger.NewConfig()))
 
 	authFilePath := filepath.Join(os.TempDir(), fmt.Sprintf("%s-%s.json", authFilePrefix, apimachineryrand.String(8)))
@@ -163,10 +169,6 @@ func run(cfg *config) error {
 		}
 	}
 
-	if err := validateTLSConfig(cfg); err != nil {
-		return err
-	}
-
 	protocol := "http://"
 	if cfg.certFile != "" && cfg.keyFile != "" {
 		protocol = "https://"
@@ -243,7 +245,7 @@ func run(cfg *config) error {
 		return err
 	}
 
-	if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
+	if err := mgr.Start(ctx); err != nil {
 		return fmt.Errorf("problem running manager: %w", err)
 	}