From 3a68d0097081785c93fb65237060296eab5023aa Mon Sep 17 00:00:00 2001 From: Chris Richardson Date: Thu, 3 Jul 2025 15:26:55 -0400 Subject: [PATCH] comment out --- cmd/main.go | 1 + internal/controller/locustcluster_controller.go | 17 ++++++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmd/main.go b/cmd/main.go index e2be408..1e5ce14 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -210,6 +210,7 @@ func main() { ctx := context.Background() if err = (&controller.LocustClusterReconciler{ Client: mgr.GetClient(), + Log: logger.WithName("controllers").WithName("LocustCluster"), Scheme: mgr.GetScheme(), }).SetupWithManager(mgr, ctx); err != nil { setupLog.Error(err, "unable to create controller", "controller", "LocustCluster") diff --git a/internal/controller/locustcluster_controller.go b/internal/controller/locustcluster_controller.go index eda1842..a8ee104 100644 --- a/internal/controller/locustcluster_controller.go +++ b/internal/controller/locustcluster_controller.go @@ -18,6 +18,7 @@ package controller import ( "context" + "github.com/go-logr/logr" locustiov1alpha1 "git.lilpenguins.com/crichardson/locust-operator/api/v1alpha1" apps "k8s.io/api/apps/v1" @@ -28,13 +29,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/event" - logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/predicate" ) // LocustClusterReconciler reconciles a LocustCluster object type LocustClusterReconciler struct { client.Client + Log logr.Logger Scheme *runtime.Scheme } @@ -52,9 +53,8 @@ type LocustClusterReconciler struct { // For more details, check Reconcile and its Result here: // - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.20.4/pkg/reconcile func (r *LocustClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { - log := logf.FromContext(ctx).WithValues() - log.Info("Looking up LocustCluster") + r.Log.Info("Looking up LocustCluster") // logf.Log.Info("Looking up LocustCluster", "LocustClusterName", req.Name, // "Namespace", req.Namespace) @@ -62,12 +62,12 @@ func (r *LocustClusterReconciler) Reconcile(ctx context.Context, req ctrl.Reques _, err := GetLocustCluster(r.Client, ctx, req.Namespace, req.Name) if err != nil { if apierrors.IsNotFound(err) { - log.Info("LocustCluster not found") + r.Log.Info("LocustCluster not found") // logf.Log.Info("LocustCluster not found", "LocustClusterName", req.Name, // "Namespace", req.Namespace) return ctrl.Result{}, nil } - log.Error(err, "LocustCluster not found") + r.Log.Error(err, "LocustCluster not found") // logf.Log.Error(err, "Failed to lookup LocustCluster", "LocustClusterName", req.Name, // "Namespace", req.Namespace) return ctrl.Result{Requeue: true}, err @@ -95,19 +95,18 @@ func (r *LocustClusterReconciler) SetupWithManager(mgr ctrl.Manager, ctx context Complete(r) */ - log := logf.FromContext(ctx).WithValues() ns := "default" predLocustCluster := predicate.Funcs{ UpdateFunc: func(e event.UpdateEvent) bool { - log.Info("UpdateFunc", "kind", "LocustCluster", "process event", true, "event.namespace", e.ObjectNew.GetNamespace(), "event.name", e.ObjectNew.GetName(), "currentNamespace", ns) + r.Log.Info("UpdateFunc", "kind", "LocustCluster", "process event", true, "event.namespace", e.ObjectNew.GetNamespace(), "event.name", e.ObjectNew.GetName(), "currentNamespace", ns) return true }, CreateFunc: func(e event.CreateEvent) bool { - log.Info("CreateFunc", "kind", "LocustCluster", "process event", true, "event.namespace", e.Object.GetNamespace(), "event.name", e.Object.GetName(), "currentNamespace", ns) + r.Log.Info("CreateFunc", "kind", "LocustCluster", "process event", true, "event.namespace", e.Object.GetNamespace(), "event.name", e.Object.GetName(), "currentNamespace", ns) return true }, DeleteFunc: func(e event.DeleteEvent) bool { - log.Info("DeleteFunc", "kind", "LocustCluster", "process event", false, "event.namespace", e.Object.GetNamespace(), "event.name", e.Object.GetName(), "currentNamespace", ns) + r.Log.Info("DeleteFunc", "kind", "LocustCluster", "process event", false, "event.namespace", e.Object.GetNamespace(), "event.name", e.Object.GetName(), "currentNamespace", ns) return false }, }