From 99e0923480f5e8cb0f2826055590e4f29b801f26 Mon Sep 17 00:00:00 2001 From: interma Date: Thu, 1 Nov 2018 13:44:46 +0800 Subject: [PATCH] fix incorrect logr usage --- pkg/scaffold/controller/controller.go | 4 ++-- test/project/pkg/controller/firstmate/firstmate_controller.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/scaffold/controller/controller.go b/pkg/scaffold/controller/controller.go index 5298e8aaaf1..6ccde413440 100644 --- a/pkg/scaffold/controller/controller.go +++ b/pkg/scaffold/controller/controller.go @@ -249,7 +249,7 @@ func (r *Reconcile{{ .Resource.Kind }}) Reconcile(request reconcile.Request) (re found := &appsv1.Deployment{} err = r.Get(context.TODO(), types.NamespacedName{Name: deploy.Name, Namespace: deploy.Namespace}, found) if err != nil && errors.IsNotFound(err) { - log.Info("Creating Deployment %s/%s\n", deploy.Namespace, deploy.Name) + log.Info("Creating Deployment", "namespace", deploy.Namespace, "name", deploy.Name) err = r.Create(context.TODO(), deploy) if err != nil { return reconcile.Result{}, err @@ -262,7 +262,7 @@ func (r *Reconcile{{ .Resource.Kind }}) Reconcile(request reconcile.Request) (re // Update the found object and write the result back if there are any changes if !reflect.DeepEqual(deploy.Spec, found.Spec) { found.Spec = deploy.Spec - log.Info("Updating Deployment %s/%s\n", deploy.Namespace, deploy.Name) + log.Info("Updating Deployment", "namespace", deploy.Namespace, "name", deploy.Name) err = r.Update(context.TODO(), found) if err != nil { return reconcile.Result{}, err diff --git a/test/project/pkg/controller/firstmate/firstmate_controller.go b/test/project/pkg/controller/firstmate/firstmate_controller.go index 042f9bd1e09..179700e4f73 100644 --- a/test/project/pkg/controller/firstmate/firstmate_controller.go +++ b/test/project/pkg/controller/firstmate/firstmate_controller.go @@ -145,7 +145,7 @@ func (r *ReconcileFirstMate) Reconcile(request reconcile.Request) (reconcile.Res found := &appsv1.Deployment{} err = r.Get(context.TODO(), types.NamespacedName{Name: deploy.Name, Namespace: deploy.Namespace}, found) if err != nil && errors.IsNotFound(err) { - log.Info("Creating Deployment %s/%s\n", deploy.Namespace, deploy.Name) + log.Info("Creating Deployment", "namespace", deploy.Namespace, "name", deploy.Name) err = r.Create(context.TODO(), deploy) if err != nil { return reconcile.Result{}, err @@ -158,7 +158,7 @@ func (r *ReconcileFirstMate) Reconcile(request reconcile.Request) (reconcile.Res // Update the found object and write the result back if there are any changes if !reflect.DeepEqual(deploy.Spec, found.Spec) { found.Spec = deploy.Spec - log.Info("Updating Deployment %s/%s\n", deploy.Namespace, deploy.Name) + log.Info("Updating Deployment", "namespace", deploy.Namespace, "name", deploy.Name) err = r.Update(context.TODO(), found) if err != nil { return reconcile.Result{}, err