update

Author: sbueringer

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))
 			}