Merge pull request kubernetes-sigs#685 from makhov/respect-log-level-from-args

🐛 Respect log level from the command-line arguments

(cherry picked from commit 014374a)

Author: k8s-ci-robot

cmd/agent/main.go

@@ -36,9 +36,11 @@ func main() {
 	flags.AddFlagSet(o.Flags())
 	local := flag.NewFlagSet(os.Args[0], flag.ExitOnError)
 	klog.InitFlags(local)
-	err := local.Set("v", "4")
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "error setting klog flags: %v", err)
+	if local.Lookup("v") == nil {
+		err := local.Set("v", "4")
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "error setting klog flags: %v", err)
+		}
 	}
 	local.VisitAll(func(fl *flag.Flag) {
 		fl.Name = util.Normalize(fl.Name)

cmd/server/main.go

@@ -36,9 +36,11 @@ func main() {
 	flags.AddFlagSet(o.Flags())
 	local := flag.NewFlagSet(os.Args[0], flag.ExitOnError)
 	klog.InitFlags(local)
-	err := local.Set("v", "4")
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "error setting klog flags: %v", err)
+	if local.Lookup("v") == nil {
+		err := local.Set("v", "4")
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "error setting klog flags: %v", err)
+		}
 	}
 	local.VisitAll(func(fl *flag.Flag) {
 		fl.Name = util.Normalize(fl.Name)