Merge pull request #609 from janetkuo/template-controller-log

k8s-ci-robot · web-flow · commit c2276b8af816 · 2019-02-22T14:14:01.000-08:00
Template controller name when logging
diff --git a/pkg/scaffold/controller/controller.go b/pkg/scaffold/controller/controller.go
@@ -125,7 +125,7 @@ import (
 	{{ .Resource.Group}}{{ .Resource.Version }} "{{ .ResourcePackage }}/{{ .Resource.Group}}/{{ .Resource.Version }}"
 )
 
-var log = logf.Log.WithName("controller")
+var log = logf.Log.WithName("{{ lower .Resource.Kind }}-controller")
 {{ else }}	"context"
 
 	appsv1 "k8s.io/api/apps/v1"
diff --git a/test/project/pkg/controller/firstmate/firstmate_controller.go b/test/project/pkg/controller/firstmate/firstmate_controller.go
@@ -37,7 +37,7 @@ import (
 	crewv1 "sigs.k8s.io/kubebuilder/test/project/pkg/apis/crew/v1"
 )
 
-var log = logf.Log.WithName("controller")
+var log = logf.Log.WithName("firstmate-controller")
 
 /**
 * USER ACTION REQUIRED: This is a scaffold file intended for the user to modify with their own Controller

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ import (`
`125`	`125`	`{{ .Resource.Group}}{{ .Resource.Version }} "{{ .ResourcePackage }}/{{ .Resource.Group}}/{{ .Resource.Version }}"`
`126`	`126`	`)`
`127`	`127`
`128`		`-var log = logf.Log.WithName("controller")`
	`128`	`+var log = logf.Log.WithName("{{ lower .Resource.Kind }}-controller")`
`129`	`129`	`{{ else }} "context"`
`130`	`130`
`131`	`131`	`appsv1 "k8s.io/api/apps/v1"`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ import (`
`37`	`37`	`crewv1 "sigs.k8s.io/kubebuilder/test/project/pkg/apis/crew/v1"`
`38`	`38`	`)`
`39`	`39`
`40`		`-var log = logf.Log.WithName("controller")`
	`40`	`+var log = logf.Log.WithName("firstmate-controller")`
`41`	`41`
`42`	`42`	`/**`
`43`	`43`	`* USER ACTION REQUIRED: This is a scaffold file intended for the user to modify with their own Controller`