From 0fed449107acd554cfdc1ca0968298fe07708068 Mon Sep 17 00:00:00 2001 From: Pablo RUTH Date: Fri, 25 Oct 2019 16:44:59 +0200 Subject: [PATCH] Add flag for log level --- api/secretHandler.go | 2 -- cmd/root.go | 13 +++++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/api/secretHandler.go b/api/secretHandler.go index 29becdc..4f35f34 100644 --- a/api/secretHandler.go +++ b/api/secretHandler.go @@ -2,7 +2,6 @@ package api import ( "encoding/json" - "fmt" "io/ioutil" "net/http" @@ -57,7 +56,6 @@ func (s *Server) secretHandler(w http.ResponseWriter, r *http.Request) { } // Parse secret object - fmt.Println(string(admissionReview.Request.Object.Raw)) var secret corev1.Secret err = json.Unmarshal(admissionReview.Request.Object.Raw, &secret) if err != nil { diff --git a/cmd/root.go b/cmd/root.go index f5e794c..fe1a4f3 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -38,10 +38,14 @@ var rootCmd = &cobra.Command{ } logger := logrus.New() - logger.SetLevel(logrus.DebugLevel) + level, err := logrus.ParseLevel(viper.GetString("loglevel")) + if err != nil { + return fmt.Errorf("failed to parse loglevel: %s", err) + } + logger.SetLevel(level) server := api.Server{ - Listen: viper.GetString("listen"), + Listen: viper.GetString("address"), Cert: viper.GetString("cert"), Key: viper.GetString("key"), Vault: vc, @@ -62,14 +66,15 @@ func Execute() { func init() { cobra.OnInitialize(initConfig) - rootCmd.Flags().StringP("listen", "l", ":8443", "HTTPS Port to listen [$KVW_LISTEN]") + rootCmd.Flags().StringP("address", "a", ":8443", "HTTPS Port to listen [$KVW_LISTEN]") rootCmd.Flags().StringP("cert", "c", "", "HTTPS certificate file (required) [$KVW_CERT]") rootCmd.Flags().StringP("key", "k", "", "HTTPS key file (required) [$KVW_KEY]") rootCmd.Flags().StringP("vault-addr", "v", "", "Vault address (required) [$KVW_VAULT-ADDR]") rootCmd.Flags().StringP("vault-token", "t", "", "Vault token path (required) [$KVW_VAULT-TOKEN]") rootCmd.Flags().StringP("vault-pattern", "p", "{{namespace}}", "Vault search pattern [$KVW_VAULT-PATTERN]") + rootCmd.Flags().StringP("loglevel", "l", "info", "Webhook loglevel [$KVW_LOGLEVEL]") - flags := []string{"listen", "cert", "key", "vault-addr", "vault-token", "vault-pattern"} + flags := []string{"address", "cert", "key", "vault-addr", "vault-token", "vault-pattern", "loglevel"} for _, flag := range flags { err := viper.BindPFlag(flag, rootCmd.Flags().Lookup(flag)) if err != nil {