Skip to content

Commit 3cb5b5c

Browse files
committed
Use logger.SetLogger to also configure klog
This uses the newly introduced helper from runtime, which also configures the logger for `klog`. Resulting in all logs now being properly formatted, even when logged by internal Kubernetes elements like the leader election or a dynamic client. Signed-off-by: Hidde Beydals <hidde@hhh.computer>
1 parent 834b928 commit 3cb5b5c

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/fluxcd/pkg/apis/event v0.4.1
1111
github.com/fluxcd/pkg/apis/kustomize v0.8.1
1212
github.com/fluxcd/pkg/apis/meta v0.19.1
13-
github.com/fluxcd/pkg/runtime v0.30.0
13+
github.com/fluxcd/pkg/runtime v0.31.0
1414
github.com/fluxcd/pkg/ssa v0.24.1
1515
github.com/fluxcd/source-controller/api v0.35.2
1616
github.com/go-logr/logr v1.2.3

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ github.com/fluxcd/pkg/apis/kustomize v0.8.1 h1:uRH9xVDJfSBGIiL6PIhkguHvf2Nme6uTW
166166
github.com/fluxcd/pkg/apis/kustomize v0.8.1/go.mod h1:TBem+2mHp6Ib7XD1fmzDkoUnBzx07wSzIYo6BVx3XAc=
167167
github.com/fluxcd/pkg/apis/meta v0.19.1 h1:fCI5CnTXpAqr67UlaI9q0H+OztMKB5kDTr6xV6vlAo0=
168168
github.com/fluxcd/pkg/apis/meta v0.19.1/go.mod h1:ZPPMYrPnWwPQYNEGM/Uc0N4SurUPS3xNI3IIpCQEfuM=
169-
github.com/fluxcd/pkg/runtime v0.30.0 h1:mAC6uO0q/K3lQ3QnBCBWyleplrYlppQ6Dco5kXH1L40=
170-
github.com/fluxcd/pkg/runtime v0.30.0/go.mod h1:wzJVtLLf34v1wPhSoB+z8qkwS/pZqUArjSoCcekXc30=
169+
github.com/fluxcd/pkg/runtime v0.31.0 h1:addyXaANHl/A68bEjCbiR4HzcFKgfXv1eaG7B7ZHxOo=
170+
github.com/fluxcd/pkg/runtime v0.31.0/go.mod h1:toGOOubMo4ZC1aWhB8C3drdTglr1/A1dETeNwjiIv0g=
171171
github.com/fluxcd/pkg/ssa v0.24.1 h1:0dn5FqyYdGa+VuDp5EJrkLbPq5xhhSAAkMgGUeMpOM0=
172172
github.com/fluxcd/pkg/ssa v0.24.1/go.mod h1:nEOUOwGotBlNZkTkO6GHPlI0U0BmHTavFd1Jk+TzsGw=
173173
github.com/fluxcd/source-controller/api v0.35.2 h1:1xTB0hIR8pmE8JJUQd41dHPbPx4a7EnH5iPY6bg83Oc=

main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ func main() {
122122

123123
flag.Parse()
124124

125-
ctrl.SetLogger(logger.NewLogger(logOptions))
125+
logger.SetLogger(logger.NewLogger(logOptions))
126126

127127
err := featureGates.WithLogger(setupLog).
128128
SupportedFeatures(features.FeatureGates())

0 commit comments

Comments
 (0)