From e177e9226a0b940182f7c77e5e3b3134025347d3 Mon Sep 17 00:00:00 2001 From: Stefan Bueringer Date: Tue, 8 Mar 2022 10:04:45 +0100 Subject: [PATCH] update --- pkg/builder/controller.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkg/builder/controller.go b/pkg/builder/controller.go index 6ba801829d..58eb13ac0d 100644 --- a/pkg/builder/controller.go +++ b/pkg/builder/controller.go @@ -312,13 +312,16 @@ func (blder *Builder) doController(r reconcile.Reconciler) error { // Setup the logger. if ctrlOptions.LogConstructor == nil { - log := blder.mgr.GetLogger() - log = log.WithValues("reconcilerGroup", gvk.Group, "reconcilerKind", gvk.Kind) - log = log.WithValues("controller", controllerName) + log = blder.mgr.GetLogger().WithValues( + "controller", controllerName, + "controllerGroup", gvk.Group, + "controllerKind", gvk.Kind, + ) lowerCamelCaseKind := strings.ToLower(gvk.Kind[:1]) + gvk.Kind[1:] ctrlOptions.LogConstructor = func(req *reconcile.Request) logr.Logger { + log := log if req != nil { log = log.WithValues(lowerCamelCaseKind, klog.KRef(req.Namespace, req.Name)) }