Merge pull request #2842 from ncdc/no-direct-klog

openshift-merge-robot · web-flow · commit 771cfc8ac154 · 2023-02-22T17:38:27.000+01:00
🌱 Remove direct klog usage
diff --git a/hack/logcheck.out b/hack/logcheck.out
@@ -1 +0,0 @@
-/pkg/reconciler/cache/labelclusterroles/labelclusterrole_controller.go:148:3: function "Errorf" should not be used, convert to contextual logging
diff --git a/pkg/reconciler/cache/labelclusterroles/labelclusterrole_controller.go b/pkg/reconciler/cache/labelclusterroles/labelclusterrole_controller.go
@@ -145,7 +145,8 @@ type controller struct {
 func (c *controller) EnqueueClusterRoles(values ...interface{}) {
 	clusterRoles, err := c.clusterRoleLister.List(labels.Everything())
 	if err != nil {
-		klog.Errorf("Error listing ClusterRoles: %v", err)
+		logger := logging.WithReconciler(klog.Background(), c.controllerName)
+		logger.Error(err, "error listing ClusterRoles")
 		return
 	}
 	for _, cr := range clusterRoles {

Original file line number	Diff line number	Diff line change
`@@ -1 +0,0 @@`
`1`		`-/pkg/reconciler/cache/labelclusterroles/labelclusterrole_controller.go:148:3: function "Errorf" should not be used, convert to contextual logging`