K8SPS-270: Logging improvements (#334)

* ps-controller name.

* Named controller.

* Cleanup

---------

Co-authored-by: Viacheslav Sarzhan <[email protected]>

Author: inelpandzic

cmd/manager/main.go

@@ -118,7 +118,7 @@ func main() {
 		Scheme:        mgr.GetScheme(),
 		ServerVersion: serverVersion,
 	}).SetupWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to create controller", "controller", "PerconaServerMySQL")
+		setupLog.Error(err, "unable to create controller", "controller", "ps-controller")
 		os.Exit(1)
 	}
 	if err = (&psbackup.PerconaServerMySQLBackupReconciler{

pkg/controller/ps/controller.go

@@ -73,6 +73,7 @@ type PerconaServerMySQLReconciler struct {
 func (r *PerconaServerMySQLReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&apiv1alpha1.PerconaServerMySQL{}).
+		Named("ps-controller").
 		Complete(r)
 }
 
@@ -89,7 +90,7 @@ func (r *PerconaServerMySQLReconciler) Reconcile(
 	ctx context.Context,
 	req ctrl.Request,
 ) (ctrl.Result, error) {
-	log := logf.FromContext(ctx).WithName("PerconaServerMySQL")
+	log := logf.FromContext(ctx)
 
 	rr := ctrl.Result{RequeueAfter: 5 * time.Second}
 

pkg/controller/psbackup/controller.go

@@ -63,6 +63,7 @@ type PerconaServerMySQLBackupReconciler struct {
 func (r *PerconaServerMySQLBackupReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&apiv1alpha1.PerconaServerMySQLBackup{}).
+		Named("psbackup-controller").
 		Complete(r)
 }
 

pkg/controller/psrestore/controller.go

@@ -439,6 +439,7 @@ func (r *PerconaServerMySQLRestoreReconciler) unpauseCluster(ctx context.Context
 func (r *PerconaServerMySQLRestoreReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&apiv1alpha1.PerconaServerMySQLRestore{}).
+		Named("psrestore-controller").
 		Owns(&batchv1.Job{}).
 		Complete(r)
 }