Skip to content
Permalink
Browse files

Merge pull request #81305 from tedyu/evt-patch-err

Error code incorrectly hidden in recordEvent

Kubernetes-commit: f22b67dd8f9f4c1ce7434a6432e4f952ef36ea32
  • Loading branch information...
k8s-publishing-bot committed Aug 13, 2019
2 parents 48bc059 + cde59a2 commit 7eecfc25a0aacda71a9711c2e08c4a583bc0a07b
Showing with 3 additions and 3 deletions.
  1. +3 −3 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)

0 comments on commit 7eecfc2

Please sign in to comment.
You can’t perform that action at this time.