Skip to content

Commit 5e647e2

Browse files
authored
Merge pull request #1044 from fluxcd/runtime-logger-klog
Use `logger.SetLogger` to also configure `klog`
2 parents fb2e03a + 43f83ed commit 5e647e2

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
@@ -29,7 +29,7 @@ require (
2929
github.com/fluxcd/pkg/lockedfile v0.1.0
3030
github.com/fluxcd/pkg/masktoken v0.2.0
3131
github.com/fluxcd/pkg/oci v0.20.1
32-
github.com/fluxcd/pkg/runtime v0.30.0
32+
github.com/fluxcd/pkg/runtime v0.31.0
3333
github.com/fluxcd/pkg/sourceignore v0.3.2
3434
github.com/fluxcd/pkg/ssh v0.7.2
3535
github.com/fluxcd/pkg/testserver v0.4.0

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -548,8 +548,8 @@ github.com/fluxcd/pkg/masktoken v0.2.0 h1:HoSPTk4l1fz5Fevs2vVRvZGru33blfMwWSZKsH
548548
github.com/fluxcd/pkg/masktoken v0.2.0/go.mod h1:EA7GleAHL33kN6kTW06m5R3/Q26IyuGO7Ef/0CtpDI0=
549549
github.com/fluxcd/pkg/oci v0.20.1 h1:MysI8N4lcKjb3B/EMtFXVoyStU5xTVGIKXj9J81xeAM=
550550
github.com/fluxcd/pkg/oci v0.20.1/go.mod h1:DvGuPqQvoVeDmiIKNCpjgIIs2MdkGIS0BjhLZIVfOWA=
551-
github.com/fluxcd/pkg/runtime v0.30.0 h1:mAC6uO0q/K3lQ3QnBCBWyleplrYlppQ6Dco5kXH1L40=
552-
github.com/fluxcd/pkg/runtime v0.30.0/go.mod h1:wzJVtLLf34v1wPhSoB+z8qkwS/pZqUArjSoCcekXc30=
551+
github.com/fluxcd/pkg/runtime v0.31.0 h1:addyXaANHl/A68bEjCbiR4HzcFKgfXv1eaG7B7ZHxOo=
552+
github.com/fluxcd/pkg/runtime v0.31.0/go.mod h1:toGOOubMo4ZC1aWhB8C3drdTglr1/A1dETeNwjiIv0g=
553553
github.com/fluxcd/pkg/sourceignore v0.3.2 h1:UXRguBJA9frgRDSr7Lsc873a9YTbbpbJafEaYjkpVEs=
554554
github.com/fluxcd/pkg/sourceignore v0.3.2/go.mod h1:yuJzKggph0Bdbk9LgXjJQhvJZSTJV/1vS7mJuB7mPa0=
555555
github.com/fluxcd/pkg/ssh v0.7.2 h1:kyAcwUYOMdxN9sOBNSYKiNgmIpbx94VufwqtKucW54M=

main.go

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

155155
flag.Parse()
156156

157-
ctrl.SetLogger(logger.NewLogger(logOptions))
157+
logger.SetLogger(logger.NewLogger(logOptions))
158158

159159
err := featureGates.WithLogger(setupLog).
160160
SupportedFeatures(features.FeatureGates())

0 commit comments

Comments
 (0)