From 353165a3c7e54d6572f833afe08c33bc07d3e180 Mon Sep 17 00:00:00 2001 From: Bryce Palmer Date: Thu, 8 Jun 2023 14:36:14 -0400 Subject: [PATCH] address review comments Signed-off-by: Bryce Palmer --- cmd/manager/main.go | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/cmd/manager/main.go b/cmd/manager/main.go index 7f7e5d4b..05ecd3d1 100644 --- a/cmd/manager/main.go +++ b/cmd/manager/main.go @@ -64,8 +64,7 @@ func main() { catalogdVersion bool sysNs string ) - // set up a regular go flagset for our normal flags - flagSet := flag.NewFlagSet("catalogd-flagset", flag.ExitOnError) + flagSet := flag.NewFlagSet("catalogd", flag.ExitOnError) flagSet.StringVar(&metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.") flagSet.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.") flagSet.BoolVar(&enableLeaderElection, "leader-elect", false, @@ -76,20 +75,14 @@ func main() { flagSet.StringVar(&sysNs, "system-ns", "catalogd-system", "The namespace catalogd uses for internal state, configuration, and workloads") flagSet.BoolVar(&profiling, "profiling", false, "enable profiling endpoints to allow for using pprof") flagSet.BoolVar(&catalogdVersion, "version", false, "print the catalogd version and exit") - - // set up zap options and add flags to the flagset opts := zap.Options{ Development: true, } opts.BindFlags(flagSet) - // set up feature gate flags. This has to use a pflag flagset - pFlagSet := pflag.NewFlagSet("featuregate-flagset", pflag.ExitOnError) - features.CatalogdFeatureGate.AddFlag(pFlagSet) - // Combine both flagsets and parse them pflag.CommandLine.AddGoFlagSet(flagSet) - pflag.CommandLine.AddFlagSet(pFlagSet) + features.CatalogdFeatureGate.AddFlag(pflag.CommandLine) pflag.Parse() if catalogdVersion {