Short-circuit event handling

When ExternalEventRecorder is nil, the helm release reference is not used
therefore the function can safely return early.

Signed-off-by: Paulo Gomes <paulo.gomes@weave.works>
This commit is contained in:
Paulo Gomes 2021-12-21 14:08:38 +00:00
parent c9b1a4f4f8
commit 0837f6f34a
No known key found for this signature in database
GPG Key ID: 9995233870E99BEE
1 changed files with 11 additions and 9 deletions

View File

@ -741,21 +741,23 @@ func (r *HelmReleaseReconciler) event(ctx context.Context, hr v2.HelmRelease, re
r.EventRecorder.Event(&hr, "Normal", severity, msg) r.EventRecorder.Event(&hr, "Normal", severity, msg)
} }
if r.ExternalEventRecorder == nil {
return
}
objRef, err := reference.GetReference(r.Scheme, &hr) objRef, err := reference.GetReference(r.Scheme, &hr)
if err != nil { if err != nil {
logr.FromContext(ctx).Error(err, "unable to send event") logr.FromContext(ctx).Error(err, "unable to send event")
return return
} }
if r.ExternalEventRecorder != nil { var meta map[string]string
var meta map[string]string if revision != "" {
if revision != "" { meta = map[string]string{"revision": revision}
meta = map[string]string{"revision": revision} }
} if err := r.ExternalEventRecorder.Eventf(*objRef, meta, severity, severity, msg); err != nil {
if err := r.ExternalEventRecorder.Eventf(*objRef, meta, severity, severity, msg); err != nil { logr.FromContext(ctx).Error(err, "unable to send event")
logr.FromContext(ctx).Error(err, "unable to send event") return
return
}
} }
} }