Skip to content

Commit dc7e051

Browse files
authored
set klog logger (#3833)
this ensures that the leader election will also use the configured logger
1 parent 644600a commit dc7e051

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ require (
2323
k8s.io/apimachinery v0.30.0
2424
k8s.io/cli-runtime v0.30.0
2525
k8s.io/client-go v0.30.0
26+
k8s.io/klog/v2 v2.120.1
2627
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
2728
sigs.k8s.io/controller-runtime v0.18.2
2829
sigs.k8s.io/yaml v1.4.0
@@ -166,7 +167,6 @@ require (
166167
k8s.io/apiextensions-apiserver v0.30.0 // indirect
167168
k8s.io/apiserver v0.30.0 // indirect
168169
k8s.io/component-base v0.30.0 // indirect
169-
k8s.io/klog/v2 v2.120.1 // indirect
170170
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
171171
k8s.io/kubectl v0.30.0 // indirect
172172
moul.io/http2curl/v2 v2.3.0 // indirect

main.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
"k8s.io/client-go/kubernetes"
2929
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
3030
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
31+
"k8s.io/klog/v2"
3132
elbv2api "sigs.k8s.io/aws-load-balancer-controller/apis/elbv2/v1beta1"
3233
elbv2controller "sigs.k8s.io/aws-load-balancer-controller/controllers/elbv2"
3334
"sigs.k8s.io/aws-load-balancer-controller/controllers/ingress"
@@ -75,7 +76,9 @@ func main() {
7576
infoLogger.Error(err, "unable to load controller config")
7677
os.Exit(1)
7778
}
78-
ctrl.SetLogger(getLoggerWithLogLevel(controllerCFG.LogLevel))
79+
appLogger := getLoggerWithLogLevel(controllerCFG.LogLevel)
80+
ctrl.SetLogger(appLogger)
81+
klog.SetLoggerWithOptions(appLogger, klog.ContextualLogger(true))
7982

8083
cloud, err := aws.NewCloud(controllerCFG.AWSConfig, metrics.Registry, ctrl.Log)
8184
if err != nil {

0 commit comments

Comments
 (0)