From cde59a28d7ffb53ce41019f1b1a5a4bb0e3c5a5b Mon Sep 17 00:00:00 2001 From: Ted Yu Date: Mon, 12 Aug 2019 12:11:37 -0700 Subject: [PATCH] Error code incorrectly hidden in recordEvent Kubernetes-commit: 31f374f42a2c816c8fb928c5db46474f5fc24b31 --- tools/events/event_broadcaster.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/events/event_broadcaster.go b/tools/events/event_broadcaster.go index 834f6025..3acfe68b 100644 --- a/tools/events/event_broadcaster.go +++ b/tools/events/event_broadcaster.go @@ -203,9 +203,9 @@ func recordEvent(sink EventSink, event *v1beta1.Event) (*v1beta1.Event, bool) { var err error isEventSeries := event.Series != nil if isEventSeries { - patch, err := createPatchBytesForSeries(event) - if err != nil { - klog.Errorf("Unable to calculate diff, no merge is possible: %v", err) + patch, patchBytesErr := createPatchBytesForSeries(event) + if patchBytesErr != nil { + klog.Errorf("Unable to calculate diff, no merge is possible: %v", patchBytesErr) return nil, false } newEvent, err = sink.Patch(event, patch)