fixup! Fix broken kind logging

Tatsuhiro Tsujikawa · Tatsuhiro Tsujikawa · commit bb368904815c · 2022-07-13T04:50:46.000Z
diff --git a/pkg/builder/controller.go b/pkg/builder/controller.go
@@ -315,13 +315,11 @@ func (blder *Builder) doController(r reconcile.Reconciler) error {
 			"controllerKind", gvk.Kind,
 		)
 
-		kind := gvk.Kind
-
 		ctrlOptions.LogConstructor = func(req *reconcile.Request) logr.Logger {
 			log := log
 			if req != nil {
 				log = log.WithValues(
-					kind, klog.KRef(req.Namespace, req.Name),
+					gvk.Kind, klog.KRef(req.Namespace, req.Name),
 					"namespace", req.Namespace, "name", req.Name,
 				)
 			}

Original file line number	Diff line number	Diff line change
`@@ -315,13 +315,11 @@ func (blder *Builder) doController(r reconcile.Reconciler) error {`
`315`	`315`	`"controllerKind", gvk.Kind,`
`316`	`316`	`)`
`317`	`317`
`318`		`- kind := gvk.Kind`
`319`		`-`
`320`	`318`	`ctrlOptions.LogConstructor = func(req *reconcile.Request) logr.Logger {`
`321`	`319`	`log := log`
`322`	`320`	`if req != nil {`
`323`	`321`	`log = log.WithValues(`
`324`		`- kind, klog.KRef(req.Namespace, req.Name),`
	`322`	`+ gvk.Kind, klog.KRef(req.Namespace, req.Name),`
`325`	`323`	`"namespace", req.Namespace, "name", req.Name,`
`326`	`324`	`)`
`327`	`325`	`}`