Skip to content

Commit fa77fd2

Browse files
Merge pull request #1300 from openshift-splat-team/OCPBUGS-41502
OCPBUGS-41502: vSphere klog initialization preventing verbose log messages
2 parents 8e7a94a + a7fda44 commit fa77fd2

File tree

1 file changed

+8
-14
lines changed

1 file changed

+8
-14
lines changed

cmd/vsphere/main.go

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"k8s.io/apiserver/pkg/util/feature"
2424
"k8s.io/component-base/featuregate"
2525
"k8s.io/klog/v2"
26-
"k8s.io/klog/v2/textlogger"
2726
ipamv1beta1 "sigs.k8s.io/cluster-api/exp/ipam/api/v1beta1"
2827
ctrl "sigs.k8s.io/controller-runtime"
2928
"sigs.k8s.io/controller-runtime/pkg/cache"
@@ -46,9 +45,14 @@ func main() {
4645
"", "",
4746
)
4847

49-
textLoggerConfig := textlogger.NewConfig()
50-
textLoggerConfig.AddFlags(flag.CommandLine)
51-
ctrl.SetLogger(textlogger.NewLogger(textLoggerConfig))
48+
// Set log for controller-runtime
49+
ctrl.SetLogger(klog.NewKlogr())
50+
51+
klog.InitFlags(nil)
52+
if err := flag.Set("logtostderr", "true"); err != nil {
53+
klog.Fatalf("failed to set logtostderr flag: %v", err)
54+
}
55+
5256
watchNamespace := flag.String(
5357
"namespace",
5458
"",
@@ -80,12 +84,6 @@ func main() {
8084
"Address for hosting metrics",
8185
)
8286

83-
logToStderr := flag.Bool(
84-
"logtostderr",
85-
true,
86-
"log to standard error instead of files",
87-
)
88-
8987
healthAddr := flag.String(
9088
"health-addr",
9189
":9440",
@@ -104,10 +102,6 @@ func main() {
104102

105103
flag.Parse()
106104

107-
if logToStderr != nil {
108-
klog.LogToStderr(*logToStderr)
109-
}
110-
111105
if printVersion {
112106
fmt.Println(version.String)
113107
os.Exit(0)

0 commit comments

Comments
 (0)