Fix logs to be able to see the clusternames

pooknull · pooknull · commit 26c871beb4e3 · 2022-04-18T18:23:20.000+03:00
diff --git a/pkg/controller/pxc/controller.go b/pkg/controller/pxc/controller.go
@@ -29,7 +29,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
-	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
@@ -138,7 +137,7 @@ type ReconcilePerconaXtraDBCluster struct {
 }
 
 func (r *ReconcilePerconaXtraDBCluster) logger(name, namespace string) logr.Logger {
-	return log.NewDelegatingLogger(r.log).WithName("perconaxtradbcluster").
+	return r.log.WithName("perconaxtradbcluster").
 		WithValues("cluster", name, "namespace", namespace)
 }
 
diff --git a/pkg/controller/pxcbackup/controller.go b/pkg/controller/pxcbackup/controller.go
@@ -25,7 +25,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
-	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
@@ -113,7 +112,7 @@ type ReconcilePerconaXtraDBClusterBackup struct {
 }
 
 func (r *ReconcilePerconaXtraDBClusterBackup) logger(name, namespace string) logr.Logger {
-	return log.NewDelegatingLogger(r.log).WithName("perconaxtradbclusterbackup").
+	return r.log.WithName("perconaxtradbclusterbackup").
 		WithValues("backup", name, "namespace", namespace)
 }
 
diff --git a/pkg/controller/pxcrestore/controller.go b/pkg/controller/pxcrestore/controller.go
@@ -20,7 +20,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
-	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
@@ -91,7 +90,7 @@ type ReconcilePerconaXtraDBClusterRestore struct {
 }
 
 func (r *ReconcilePerconaXtraDBClusterRestore) logger(name, namespace string) logr.Logger {
-	return log.NewDelegatingLogger(r.log).WithName("perconaxtradbclusterrestore").
+	return r.log.WithName("perconaxtradbclusterrestore").
 		WithValues("restore", name, "namespace", namespace)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ import (`
`29`	`29`	`"sigs.k8s.io/controller-runtime/pkg/client/apiutil"`
`30`	`30`	`"sigs.k8s.io/controller-runtime/pkg/controller"`
`31`	`31`	`"sigs.k8s.io/controller-runtime/pkg/handler"`
`32`		`- "sigs.k8s.io/controller-runtime/pkg/log"`
`33`	`32`	`"sigs.k8s.io/controller-runtime/pkg/manager"`
`34`	`33`	`"sigs.k8s.io/controller-runtime/pkg/reconcile"`
`35`	`34`	`"sigs.k8s.io/controller-runtime/pkg/source"`
`@@ -138,7 +137,7 @@ type ReconcilePerconaXtraDBCluster struct {`
`138`	`137`	`}`
`139`	`138`
`140`	`139`	`func (r *ReconcilePerconaXtraDBCluster) logger(name, namespace string) logr.Logger {`
`141`		`- return log.NewDelegatingLogger(r.log).WithName("perconaxtradbcluster").`
	`140`	`+ return r.log.WithName("perconaxtradbcluster").`
`142`	`141`	`WithValues("cluster", name, "namespace", namespace)`
`143`	`142`	`}`
`144`	`143`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ import (`
`25`	`25`	`"sigs.k8s.io/controller-runtime/pkg/client"`
`26`	`26`	`"sigs.k8s.io/controller-runtime/pkg/controller"`
`27`	`27`	`"sigs.k8s.io/controller-runtime/pkg/handler"`
`28`		`- "sigs.k8s.io/controller-runtime/pkg/log"`
`29`	`28`	`"sigs.k8s.io/controller-runtime/pkg/manager"`
`30`	`29`	`"sigs.k8s.io/controller-runtime/pkg/reconcile"`
`31`	`30`	`"sigs.k8s.io/controller-runtime/pkg/source"`
`@@ -113,7 +112,7 @@ type ReconcilePerconaXtraDBClusterBackup struct {`
`113`	`112`	`}`
`114`	`113`
`115`	`114`	`func (r *ReconcilePerconaXtraDBClusterBackup) logger(name, namespace string) logr.Logger {`
`116`		`- return log.NewDelegatingLogger(r.log).WithName("perconaxtradbclusterbackup").`
	`115`	`+ return r.log.WithName("perconaxtradbclusterbackup").`
`117`	`116`	`WithValues("backup", name, "namespace", namespace)`
`118`	`117`	`}`
`119`	`118`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ import (`
`20`	`20`	`"sigs.k8s.io/controller-runtime/pkg/client"`
`21`	`21`	`"sigs.k8s.io/controller-runtime/pkg/controller"`
`22`	`22`	`"sigs.k8s.io/controller-runtime/pkg/handler"`
`23`		`- "sigs.k8s.io/controller-runtime/pkg/log"`
`24`	`23`	`"sigs.k8s.io/controller-runtime/pkg/manager"`
`25`	`24`	`"sigs.k8s.io/controller-runtime/pkg/reconcile"`
`26`	`25`	`"sigs.k8s.io/controller-runtime/pkg/source"`
`@@ -91,7 +90,7 @@ type ReconcilePerconaXtraDBClusterRestore struct {`
`91`	`90`	`}`
`92`	`91`
`93`	`92`	`func (r *ReconcilePerconaXtraDBClusterRestore) logger(name, namespace string) logr.Logger {`
`94`		`- return log.NewDelegatingLogger(r.log).WithName("perconaxtradbclusterrestore").`
	`93`	`+ return r.log.WithName("perconaxtradbclusterrestore").`
`95`	`94`	`WithValues("restore", name, "namespace", namespace)`
`96`	`95`	`}`
`97`	`96`