Add hadling k8s.io/klog/v2 flags (in addition to k8s.io/klog) - disab…

…le all logs from k8s clients
openshift · Oct 15, 2020 · 7055e9b · 7055e9b
1 parent 94aa5b5
commit 7055e9b
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/cmd/openshift-install/main.go b/cmd/openshift-install/main.go
@@ -12,6 +12,7 @@ import (
 	"github.com/spf13/cobra"
 	"golang.org/x/crypto/ssh/terminal"
 	"k8s.io/klog"
+	klogv2 "k8s.io/klog/v2"
 
 	"github.com/openshift/installer/pkg/terraform/exec/plugins"
 )
@@ -26,10 +27,16 @@ var (
 func main() {
 	// This attempts to configure klog (used by vendored Kubernetes code) not
 	// to log anything.
+	// Handle k8s.io/klog
 	var fs flag.FlagSet
 	klog.InitFlags(&fs)
 	fs.Set("stderrthreshold", "4")
 	klog.SetOutput(ioutil.Discard)
+	// Handle k8s.io/klog/v2
+	var fsv2 flag.FlagSet
+	klogv2.InitFlags(&fsv2)
+	fsv2.Set("stderrthreshold", "4")
+	klogv2.SetOutput(ioutil.Discard)
 
 	if len(os.Args) > 0 {
 		base := filepath.Base(os.Args[0])