From 39bf5b61d1bec83e7b2f36b421c3b0d8398b519f Mon Sep 17 00:00:00 2001 From: Vincent Boulineau <58430298+vboulineau@users.noreply.github.com> Date: Thu, 29 Oct 2020 17:01:11 +0100 Subject: [PATCH] Fix secret backend command CLI flag (#164) * Fix secret backend * Update main.go Co-authored-by: Ivan Ilichev Co-authored-by: Ivan Ilichev --- main.go | 9 ++++++--- pkg/secrets/secrets.go | 7 +++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/main.go b/main.go index c44ee5d43..bf94aaf00 100644 --- a/main.go +++ b/main.go @@ -24,6 +24,7 @@ import ( datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/v1alpha1" "github.com/DataDog/datadog-operator/controllers" "github.com/DataDog/datadog-operator/pkg/controller/debug" + "github.com/DataDog/datadog-operator/pkg/secrets" "github.com/DataDog/datadog-operator/pkg/version" edsdatadoghqv1alpha1 "github.com/DataDog/extendeddaemonset/api/v1alpha1" "github.com/DataDog/extendeddaemonset/pkg/controller/metrics" @@ -60,13 +61,13 @@ func main() { // Custom flags var printVersion, pprofActive, supportExtendedDaemonset bool - var logEncoder string + var logEncoder, secretBackendCommand string flag.StringVar(&logEncoder, "logEncoder", "json", "log encoding ('json' or 'console')") + flag.StringVar(&secretBackendCommand, "secretBackendCommand", "", "Secret backend command") logLevel := zap.LevelFlag("loglevel", zapcore.InfoLevel, "Set log level") flag.BoolVar(&printVersion, "version", false, "Print version and exit") flag.BoolVar(&pprofActive, "pprof", false, "Enable pprof endpoint") flag.BoolVar(&supportExtendedDaemonset, "supportExtendedDaemonset", false, "Support usage of Datadog ExtendedDaemonset CRD.") - flag.Parse() // Parsing flags flag.Parse() @@ -82,9 +83,11 @@ func main() { version.PrintVersionWriter(os.Stdout, "text") os.Exit(0) } - version.PrintVersionLogs(setupLog) + // Dispatch CLI flags to each package + secrets.SetSecretBackendCommand(secretBackendCommand) + mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{ Scheme: scheme, MetricsBindAddress: metricsAddr, diff --git a/pkg/secrets/secrets.go b/pkg/secrets/secrets.go index 3977b68e0..eab4daf3a 100644 --- a/pkg/secrets/secrets.go +++ b/pkg/secrets/secrets.go @@ -14,8 +14,6 @@ import ( "os/exec" "strings" "time" - - "github.com/spf13/pflag" ) var ( @@ -28,8 +26,9 @@ const ( payloadVersion = "1.0" ) -func init() { - pflag.StringVarP(&secretBackendCommand, "secretBackendCommand", "", "", "secret backend command") +// SetSecretBackendCommand set the secretBackendCommand var +func SetSecretBackendCommand(command string) { + secretBackendCommand = command } // NewSecretBackend returns a new SecretBackend instance