Merge pull request #1302 from openshift-cherrypick-robot/cherry-pick-1300-to-release-4.17

[release-4.17] OCPBUGS-43851: vSphere klog initialization preventing verbose log messages

Author: openshift-merge-bot[bot]

cmd/vsphere/main.go

@@ -24,7 +24,6 @@ import (
 	k8sflag "k8s.io/component-base/cli/flag"
 	"k8s.io/component-base/featuregate"
 	"k8s.io/klog/v2"
-	"k8s.io/klog/v2/textlogger"
 	ipamv1beta1 "sigs.k8s.io/cluster-api/exp/ipam/api/v1beta1"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
@@ -47,9 +46,14 @@ func main() {
 		"", "",
 	)
 
-	textLoggerConfig := textlogger.NewConfig()
-	textLoggerConfig.AddFlags(flag.CommandLine)
-	ctrl.SetLogger(textlogger.NewLogger(textLoggerConfig))
+	// Set log for controller-runtime
+	ctrl.SetLogger(klog.NewKlogr())
+
+	klog.InitFlags(nil)
+	if err := flag.Set("logtostderr", "true"); err != nil {
+		klog.Fatalf("failed to set logtostderr flag: %v", err)
+	}
+
 	watchNamespace := flag.String(
 		"namespace",
 		"",
@@ -81,12 +85,6 @@ func main() {
 		"Address for hosting metrics",
 	)
 
-	logToStderr := flag.Bool(
-		"logtostderr",
-		true,
-		"log to standard error instead of files",
-	)
-
 	healthAddr := flag.String(
 		"health-addr",
 		":9440",
@@ -106,10 +104,6 @@ func main() {
 
 	flag.Parse()
 
-	if logToStderr != nil {
-		klog.LogToStderr(*logToStderr)
-	}
-
 	if printVersion {
 		fmt.Println(version.String)
 		os.Exit(0)