From ac788de041221e35c291da6409bce83376d481b9 Mon Sep 17 00:00:00 2001 From: Zvi Cahana Date: Mon, 9 Nov 2020 18:29:53 +0200 Subject: [PATCH] Cleanup some code leftovers from a previous refactor (#1118) --- pkg/predicate/predicate.go | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/pkg/predicate/predicate.go b/pkg/predicate/predicate.go index 079ef23df0..cc03fb8beb 100644 --- a/pkg/predicate/predicate.go +++ b/pkg/predicate/predicate.go @@ -122,21 +122,14 @@ type ResourceVersionChangedPredicate struct { // Update implements default UpdateEvent filter for validating resource version change func (ResourceVersionChangedPredicate) Update(e event.UpdateEvent) bool { if e.ObjectOld == nil { - log.Error(nil, "UpdateEvent has no old metadata", "event", e) - return false - } - if e.ObjectOld == nil { - log.Error(nil, "GenericEvent has no old runtime object to update", "event", e) + log.Error(nil, "Update event has no old object to update", "event", e) return false } if e.ObjectNew == nil { - log.Error(nil, "GenericEvent has no new runtime object for update", "event", e) - return false - } - if e.ObjectNew == nil { - log.Error(nil, "UpdateEvent has no new metadata", "event", e) + log.Error(nil, "Update event has no new object to update", "event", e) return false } + return e.ObjectNew.GetResourceVersion() != e.ObjectOld.GetResourceVersion() } @@ -163,21 +156,14 @@ type GenerationChangedPredicate struct { // Update implements default UpdateEvent filter for validating generation change func (GenerationChangedPredicate) Update(e event.UpdateEvent) bool { if e.ObjectOld == nil { - log.Error(nil, "Update event has no old metadata", "event", e) - return false - } - if e.ObjectOld == nil { - log.Error(nil, "Update event has no old runtime object to update", "event", e) + log.Error(nil, "Update event has no old object to update", "event", e) return false } if e.ObjectNew == nil { - log.Error(nil, "Update event has no new runtime object for update", "event", e) - return false - } - if e.ObjectNew == nil { - log.Error(nil, "Update event has no new metadata", "event", e) + log.Error(nil, "Update event has no new object for update", "event", e) return false } + return e.ObjectNew.GetGeneration() != e.ObjectOld.GetGeneration() }