From 658134fe88c79188f4b142f81e287d3d6eabb6bb Mon Sep 17 00:00:00 2001 From: Sunny Date: Sun, 4 Sep 2022 17:15:06 +0530 Subject: [PATCH 1/2] Remove setting reconcileID in helmrepo-oci logger With the new controller-runtime, the reconcileID is automatically set per reconciliation and need not be set explicitly. Signed-off-by: Sunny --- controllers/helmrepository_controller_oci.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/controllers/helmrepository_controller_oci.go b/controllers/helmrepository_controller_oci.go index 75f1ccbf0..b2291610e 100644 --- a/controllers/helmrepository_controller_oci.go +++ b/controllers/helmrepository_controller_oci.go @@ -33,7 +33,6 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" kerrors "k8s.io/apimachinery/pkg/util/errors" - "k8s.io/apimachinery/pkg/util/uuid" kuberecorder "k8s.io/client-go/tools/record" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" @@ -113,9 +112,7 @@ func (r *HelmRepositoryOCIReconciler) SetupWithManagerAndOptions(mgr ctrl.Manage func (r *HelmRepositoryOCIReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result ctrl.Result, retErr error) { start := time.Now() - log := ctrl.LoggerFrom(ctx). - // Sets a reconcile ID to correlate logs from all suboperations. - WithValues("reconcileID", uuid.NewUUID()) + log := ctrl.LoggerFrom(ctx) // logger will be associated to the new context that is // returned from ctrl.LoggerInto. From 59294bf5824ab19f91bc120092516f7375d3a9f1 Mon Sep 17 00:00:00 2001 From: Sunny Date: Sun, 4 Sep 2022 18:56:02 +0530 Subject: [PATCH 2/2] controllers: Remove ctx overwrite Context in the reconcilers were overwritten earlier after adding new log field `reconcileID` in the logger. Since the `reconcileID` is now set by controller-runtime, this is no longer needed. The logger in the context already has the field set and when the context is passed to other functions, they too have the logger with the reconcileID set. Signed-off-by: Sunny --- controllers/bucket_controller.go | 4 ---- controllers/gitrepository_controller.go | 4 ---- controllers/helmchart_controller.go | 4 ---- controllers/helmrepository_controller.go | 4 ---- controllers/helmrepository_controller_oci.go | 4 ---- controllers/ocirepository_controller.go | 4 ---- 6 files changed, 24 deletions(-) diff --git a/controllers/bucket_controller.go b/controllers/bucket_controller.go index 7854c651a..98076889c 100644 --- a/controllers/bucket_controller.go +++ b/controllers/bucket_controller.go @@ -249,10 +249,6 @@ func (r *BucketReconciler) Reconcile(ctx context.Context, req ctrl.Request) (res start := time.Now() log := ctrl.LoggerFrom(ctx) - // logger will be associated to the new context that is - // returned from ctrl.LoggerInto. - ctx = ctrl.LoggerInto(ctx, log) - // Fetch the Bucket obj := &sourcev1.Bucket{} if err := r.Get(ctx, req.NamespacedName, obj); err != nil { diff --git a/controllers/gitrepository_controller.go b/controllers/gitrepository_controller.go index 49b3f246d..3fba8bc02 100644 --- a/controllers/gitrepository_controller.go +++ b/controllers/gitrepository_controller.go @@ -164,10 +164,6 @@ func (r *GitRepositoryReconciler) Reconcile(ctx context.Context, req ctrl.Reques start := time.Now() log := ctrl.LoggerFrom(ctx) - // logger will be associated to the new context that is - // returned from ctrl.LoggerInto. - ctx = ctrl.LoggerInto(ctx, log) - // Fetch the GitRepository obj := &sourcev1.GitRepository{} if err := r.Get(ctx, req.NamespacedName, obj); err != nil { diff --git a/controllers/helmchart_controller.go b/controllers/helmchart_controller.go index 5073e0f5f..24650f5e0 100644 --- a/controllers/helmchart_controller.go +++ b/controllers/helmchart_controller.go @@ -185,10 +185,6 @@ func (r *HelmChartReconciler) Reconcile(ctx context.Context, req ctrl.Request) ( start := time.Now() log := ctrl.LoggerFrom(ctx) - // logger will be associated to the new context that is - // returned from ctrl.LoggerInto. - ctx = ctrl.LoggerInto(ctx, log) - // Fetch the HelmChart obj := &sourcev1.HelmChart{} if err := r.Get(ctx, req.NamespacedName, obj); err != nil { diff --git a/controllers/helmrepository_controller.go b/controllers/helmrepository_controller.go index f06411244..ea72a51b6 100644 --- a/controllers/helmrepository_controller.go +++ b/controllers/helmrepository_controller.go @@ -150,10 +150,6 @@ func (r *HelmRepositoryReconciler) Reconcile(ctx context.Context, req ctrl.Reque start := time.Now() log := ctrl.LoggerFrom(ctx) - // logger will be associated to the new context that is - // returned from ctrl.LoggerInto. - ctx = ctrl.LoggerInto(ctx, log) - // Fetch the HelmRepository obj := &sourcev1.HelmRepository{} if err := r.Get(ctx, req.NamespacedName, obj); err != nil { diff --git a/controllers/helmrepository_controller_oci.go b/controllers/helmrepository_controller_oci.go index b2291610e..cb2df389c 100644 --- a/controllers/helmrepository_controller_oci.go +++ b/controllers/helmrepository_controller_oci.go @@ -114,10 +114,6 @@ func (r *HelmRepositoryOCIReconciler) Reconcile(ctx context.Context, req ctrl.Re start := time.Now() log := ctrl.LoggerFrom(ctx) - // logger will be associated to the new context that is - // returned from ctrl.LoggerInto. - ctx = ctrl.LoggerInto(ctx, log) - // Fetch the HelmRepository obj := &sourcev1.HelmRepository{} if err := r.Get(ctx, req.NamespacedName, obj); err != nil { diff --git a/controllers/ocirepository_controller.go b/controllers/ocirepository_controller.go index 423f14246..1e8744b02 100644 --- a/controllers/ocirepository_controller.go +++ b/controllers/ocirepository_controller.go @@ -161,10 +161,6 @@ func (r *OCIRepositoryReconciler) Reconcile(ctx context.Context, req ctrl.Reques start := time.Now() log := ctrl.LoggerFrom(ctx) - // logger will be associated to the new context that is - // returned from ctrl.LoggerInto. - ctx = ctrl.LoggerInto(ctx, log) - // Fetch the OCIRepository obj := &sourcev1.OCIRepository{} if err := r.Get(ctx, req.NamespacedName, obj); err != nil {