From 6abe39ce822a7f741d8f8b69ab5eca10e178e956 Mon Sep 17 00:00:00 2001 From: Adam Harwayne Date: Mon, 18 Mar 2019 10:32:22 -0700 Subject: [PATCH] Do not DeepCopy() in Reconcile(), as controller-runtime already did it for us. --- pkg/reconciler/v1alpha1/broker/broker.go | 2 +- pkg/reconciler/v1alpha1/trigger/trigger.go | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pkg/reconciler/v1alpha1/broker/broker.go b/pkg/reconciler/v1alpha1/broker/broker.go index 225e65a139e..343abfc699f 100644 --- a/pkg/reconciler/v1alpha1/broker/broker.go +++ b/pkg/reconciler/v1alpha1/broker/broker.go @@ -151,7 +151,7 @@ func (r *reconciler) Reconcile(request reconcile.Request) (reconcile.Result, err r.recorder.Event(broker, corev1.EventTypeNormal, brokerReconciled, "Broker reconciled") } - if _, err = r.updateStatus(broker.DeepCopy()); err != nil { + if _, err = r.updateStatus(broker); err != nil { logging.FromContext(ctx).Error("Failed to update Broker status", zap.Error(err)) r.recorder.Eventf(broker, corev1.EventTypeWarning, brokerUpdateStatusFailed, "Failed to update Broker's status: %v", err) return reconcile.Result{}, err diff --git a/pkg/reconciler/v1alpha1/trigger/trigger.go b/pkg/reconciler/v1alpha1/trigger/trigger.go index 60d96e39862..5d3f4b71012 100644 --- a/pkg/reconciler/v1alpha1/trigger/trigger.go +++ b/pkg/reconciler/v1alpha1/trigger/trigger.go @@ -183,9 +183,6 @@ func (r *reconciler) Reconcile(request reconcile.Request) (reconcile.Result, err return reconcile.Result{}, err } - // Modify a copy, not the original. - trigger = trigger.DeepCopy() - // Reconcile this copy of the Trigger and then write back any status updates regardless of // whether the reconcile error out. reconcileErr := r.reconcile(ctx, trigger)