From 33621ca333a3beaf72cdc88ce57229546183b17e Mon Sep 17 00:00:00 2001 From: joshvanl Date: Tue, 24 Aug 2021 19:09:17 +0100 Subject: [PATCH] Use helm settings to define CLI flags for install command Signed-off-by: joshvanl --- cmd/ctl/pkg/install/BUILD.bazel | 1 - cmd/ctl/pkg/install/install.go | 9 +++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/cmd/ctl/pkg/install/BUILD.bazel b/cmd/ctl/pkg/install/BUILD.bazel index 0461b334c..468f1be2f 100644 --- a/cmd/ctl/pkg/install/BUILD.bazel +++ b/cmd/ctl/pkg/install/BUILD.bazel @@ -9,7 +9,6 @@ go_library( importpath = "github.com/jetstack/cert-manager/cmd/ctl/pkg/install", visibility = ["//visibility:public"], deps = [ - "//cmd/ctl/pkg/factory:go_default_library", "//cmd/ctl/pkg/install/helm:go_default_library", "@com_github_spf13_cobra//:go_default_library", "@com_github_spf13_pflag//:go_default_library", diff --git a/cmd/ctl/pkg/install/install.go b/cmd/ctl/pkg/install/install.go index 6b3a4f439..32ef84b02 100644 --- a/cmd/ctl/pkg/install/install.go +++ b/cmd/ctl/pkg/install/install.go @@ -35,7 +35,6 @@ import ( "helm.sh/helm/v3/pkg/release" "k8s.io/cli-runtime/pkg/genericclioptions" - "github.com/jetstack/cert-manager/cmd/ctl/pkg/factory" "github.com/jetstack/cert-manager/cmd/ctl/pkg/install/helm" ) @@ -50,7 +49,6 @@ type InstallOptions struct { Wait bool genericclioptions.IOStreams - *factory.Factory } const ( @@ -114,6 +112,9 @@ func NewCmdInstall(ctx context.Context, ioStreams genericclioptions.IOStreams) * SilenceErrors: true, } + settings.AddFlags(cmd.Flags()) + cmd.Flag("namespace").DefValue = defaultCertManagerNamespace + addInstallUninstallFlags(cmd.Flags(), &options.client.Timeout, &options.Wait) addInstallFlags(cmd.Flags(), options.client) @@ -126,10 +127,6 @@ func NewCmdInstall(ctx context.Context, ioStreams genericclioptions.IOStreams) * cmd.Flags().MarkHidden("chart-name") cmd.Flags().BoolVar(&options.DryRun, "dry-run", false, "Simulate install and output manifest") - options.Factory = factory.New(cmd) - // Set default namespace cli flag value - cmd.Flag("namespace").DefValue = defaultCertManagerNamespace - return cmd }