Merge pull request kubernetes-sigs#746 from ialidzhikov/flake/simplify-predicate

k8s-ci-robot · web-flow · commit bfbd7f7d2e5c · 2020-01-06T14:30:18.000-08:00
🏃 Minor nit in predicates
diff --git a/pkg/predicate/predicate.go b/pkg/predicate/predicate.go
@@ -112,10 +112,7 @@ func (ResourceVersionChangedPredicate) Update(e event.UpdateEvent) bool {
 		log.Error(nil, "UpdateEvent has no new metadata", "event", e)
 		return false
 	}
-	if e.MetaNew.GetResourceVersion() == e.MetaOld.GetResourceVersion() {
-		return false
-	}
-	return true
+	return e.MetaNew.GetResourceVersion() != e.MetaOld.GetResourceVersion()
 }
 
 // GenerationChangedPredicate implements a default update predicate function on Generation change.
@@ -156,8 +153,5 @@ func (GenerationChangedPredicate) Update(e event.UpdateEvent) bool {
 		log.Error(nil, "Update event has no new metadata", "event", e)
 		return false
 	}
-	if e.MetaNew.GetGeneration() == e.MetaOld.GetGeneration() {
-		return false
-	}
-	return true
+	return e.MetaNew.GetGeneration() != e.MetaOld.GetGeneration()
 }

Original file line number	Diff line number	Diff line change
`@@ -112,10 +112,7 @@ func (ResourceVersionChangedPredicate) Update(e event.UpdateEvent) bool {`
`112`	`112`	`log.Error(nil, "UpdateEvent has no new metadata", "event", e)`
`113`	`113`	`return false`
`114`	`114`	`}`
`115`		`- if e.MetaNew.GetResourceVersion() == e.MetaOld.GetResourceVersion() {`
`116`		`- return false`
`117`		`- }`
`118`		`- return true`
	`115`	`+ return e.MetaNew.GetResourceVersion() != e.MetaOld.GetResourceVersion()`
`119`	`116`	`}`
`120`	`117`
`121`	`118`	`// GenerationChangedPredicate implements a default update predicate function on Generation change.`
`@@ -156,8 +153,5 @@ func (GenerationChangedPredicate) Update(e event.UpdateEvent) bool {`
`156`	`153`	`log.Error(nil, "Update event has no new metadata", "event", e)`
`157`	`154`	`return false`
`158`	`155`	`}`
`159`		`- if e.MetaNew.GetGeneration() == e.MetaOld.GetGeneration() {`
`160`		`- return false`
`161`		`- }`
`162`		`- return true`
	`156`	`+ return e.MetaNew.GetGeneration() != e.MetaOld.GetGeneration()`
`163`	`157`	`}`