Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Error code incorrectly hidden in recordEvent #81305

Merged
merged 1 commit into from Aug 13, 2019
Merged

Error code incorrectly hidden in recordEvent #81305

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions staging/src/k8s.io/client-go/tools/events/event_broadcaster.go
View file
Open in desktop
Expand Up @@ -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)
tedyu marked this conversation as resolved.
Show resolved Hide resolved
tedyu marked this conversation as resolved.
Show resolved Hide resolved
if patchBytesErr != nil {
klog.Errorf("Unable to calculate diff, no merge is possible: %v", patchBytesErr)
return nil, false
}
newEvent, err = sink.Patch(event, patch)
Expand Down