Skip to content

Commit ac788de

Browse files
committed
Cleanup some code leftovers from a previous refactor (kubernetes-sigs#1118)
1 parent 9f0367a commit ac788de

File tree

1 file changed

+6
-20
lines changed

1 file changed

+6
-20
lines changed

pkg/predicate/predicate.go

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -122,21 +122,14 @@ type ResourceVersionChangedPredicate struct {
122122
// Update implements default UpdateEvent filter for validating resource version change
123123
func (ResourceVersionChangedPredicate) Update(e event.UpdateEvent) bool {
124124
if e.ObjectOld == nil {
125-
log.Error(nil, "UpdateEvent has no old metadata", "event", e)
126-
return false
127-
}
128-
if e.ObjectOld == nil {
129-
log.Error(nil, "GenericEvent has no old runtime object to update", "event", e)
125+
log.Error(nil, "Update event has no old object to update", "event", e)
130126
return false
131127
}
132128
if e.ObjectNew == nil {
133-
log.Error(nil, "GenericEvent has no new runtime object for update", "event", e)
134-
return false
135-
}
136-
if e.ObjectNew == nil {
137-
log.Error(nil, "UpdateEvent has no new metadata", "event", e)
129+
log.Error(nil, "Update event has no new object to update", "event", e)
138130
return false
139131
}
132+
140133
return e.ObjectNew.GetResourceVersion() != e.ObjectOld.GetResourceVersion()
141134
}
142135

@@ -163,21 +156,14 @@ type GenerationChangedPredicate struct {
163156
// Update implements default UpdateEvent filter for validating generation change
164157
func (GenerationChangedPredicate) Update(e event.UpdateEvent) bool {
165158
if e.ObjectOld == nil {
166-
log.Error(nil, "Update event has no old metadata", "event", e)
167-
return false
168-
}
169-
if e.ObjectOld == nil {
170-
log.Error(nil, "Update event has no old runtime object to update", "event", e)
159+
log.Error(nil, "Update event has no old object to update", "event", e)
171160
return false
172161
}
173162
if e.ObjectNew == nil {
174-
log.Error(nil, "Update event has no new runtime object for update", "event", e)
175-
return false
176-
}
177-
if e.ObjectNew == nil {
178-
log.Error(nil, "Update event has no new metadata", "event", e)
163+
log.Error(nil, "Update event has no new object for update", "event", e)
179164
return false
180165
}
166+
181167
return e.ObjectNew.GetGeneration() != e.ObjectOld.GetGeneration()
182168
}
183169

0 commit comments

Comments
 (0)