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 <darkowlzz@protonmail.com>
This commit is contained in:
parent
658134fe88
commit
59294bf582
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
Loading…
Reference in New Issue