Fix deletion case for extension predicates

gardener · Jun 15, 2020 · 890d732 · 890d732
1 parent daacca0
commit 890d732
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 40 deletions.
diff --git a/extensions/pkg/controller/backupbucket/controller.go b/extensions/pkg/controller/backupbucket/controller.go
@@ -67,10 +67,6 @@ func DefaultPredicates(ignoreOperationAnnotation bool) []predicate.Predicate {
 			extensionspredicate.LastOperationNotSuccessful(),
 			extensionspredicate.IsDeleting(),
 		),
-		extensionspredicate.Or(
-			extensionspredicate.HasOperationAnnotation(),
-			predicate.GenerationChangedPredicate{},
-		),
 	}
 }
 

diff --git a/extensions/pkg/controller/backupentry/controller.go b/extensions/pkg/controller/backupentry/controller.go
@@ -67,10 +67,6 @@ func DefaultPredicates(ignoreOperationAnnotation bool) []predicate.Predicate {
 			extensionspredicate.LastOperationNotSuccessful(),
 			extensionspredicate.IsDeleting(),
 		),
-		extensionspredicate.Or(
-			extensionspredicate.HasOperationAnnotation(),
-			predicate.GenerationChangedPredicate{},
-		),
 	}
 }
 

diff --git a/extensions/pkg/controller/containerruntime/controller.go b/extensions/pkg/controller/containerruntime/controller.go
@@ -77,10 +77,6 @@ func DefaultPredicates(ignoreOperationAnnotation bool) []predicate.Predicate {
 			extensionspredicate.IsDeleting(),
 		),
 		extensionspredicate.ShootNotFailed(),
-		extensionspredicate.Or(
-			extensionspredicate.HasOperationAnnotation(),
-			predicate.GenerationChangedPredicate{},
-		),
 	}
 }
 

diff --git a/extensions/pkg/controller/controlplane/controller.go b/extensions/pkg/controller/controlplane/controller.go
@@ -67,10 +67,6 @@ func DefaultPredicates(ignoreOperationAnnotation bool) []predicate.Predicate {
 			extensionspredicate.IsDeleting(),
 		),
 		extensionspredicate.ShootNotFailed(),
-		extensionspredicate.Or(
-			extensionspredicate.HasOperationAnnotation(),
-			predicate.GenerationChangedPredicate{},
-		),
 	}
 }
 

diff --git a/extensions/pkg/controller/extension/reconciler.go b/extensions/pkg/controller/extension/reconciler.go
@@ -91,10 +91,6 @@ func DefaultPredicates(ignoreOperationAnnotation bool) []predicate.Predicate {
 			extensionspredicate.IsDeleting(),
 		),
 		extensionspredicate.ShootNotFailed(),
-		extensionspredicate.Or(
-			extensionspredicate.HasOperationAnnotation(),
-			predicate.GenerationChangedPredicate{},
-		),
 	}
 }
 

diff --git a/extensions/pkg/controller/infrastructure/controller.go b/extensions/pkg/controller/infrastructure/controller.go
@@ -71,10 +71,6 @@ func DefaultPredicates(ignoreOperationAnnotation bool) []predicate.Predicate {
 			extensionspredicate.IsDeleting(),
 		),
 		extensionspredicate.ShootNotFailed(),
-		extensionspredicate.Or(
-			extensionspredicate.HasOperationAnnotation(),
-			predicate.GenerationChangedPredicate{},
-		),
 	}
 }
 

diff --git a/extensions/pkg/controller/network/controller.go b/extensions/pkg/controller/network/controller.go
@@ -67,10 +67,6 @@ func DefaultPredicates(ignoreOperationAnnotation bool) []predicate.Predicate {
 			extensionspredicate.IsDeleting(),
 		),
 		extensionspredicate.ShootNotFailed(),
-		extensionspredicate.Or(
-			extensionspredicate.HasOperationAnnotation(),
-			predicate.GenerationChangedPredicate{},
-		),
 	}
 }
 

diff --git a/extensions/pkg/controller/operatingsystemconfig/controller.go b/extensions/pkg/controller/operatingsystemconfig/controller.go
@@ -72,10 +72,6 @@ func DefaultPredicates(ignoreOperationAnnotation bool) []predicate.Predicate {
 			extensionspredicate.LastOperationNotSuccessful(),
 			extensionspredicate.IsDeleting(),
 		),
-		extensionspredicate.Or(
-			extensionspredicate.HasOperationAnnotation(),
-			predicate.GenerationChangedPredicate{},
-		),
 	}
 }
 

diff --git a/extensions/pkg/controller/worker/controller.go b/extensions/pkg/controller/worker/controller.go
@@ -71,10 +71,6 @@ func DefaultPredicates(ignoreOperationAnnotation bool) []predicate.Predicate {
 			extensionspredicate.IsDeleting(),
 		),
 		extensionspredicate.ShootNotFailed(),
-		extensionspredicate.Or(
-			extensionspredicate.HasOperationAnnotation(),
-			predicate.GenerationChangedPredicate{},
-		),
 	}
 }
 

diff --git a/extensions/pkg/predicate/predicate.go b/extensions/pkg/predicate/predicate.go
@@ -166,7 +166,7 @@ func HasOperationAnnotation() predicate.Predicate {
 	}), CreateTrigger, UpdateNewTrigger, GenericTrigger)
 }
 
-// LastOperationNotSuccessful is a predicate for unsuccessful last operations for creation events.
+// LastOperationNotSuccessful is a predicate for unsuccessful last operations **only** for creation events.
 func LastOperationNotSuccessful() predicate.Predicate {
 	operationNotSucceeded := func(obj runtime.Object) bool {
 		acc, err := extensions.Accessor(obj)
@@ -184,13 +184,13 @@ func LastOperationNotSuccessful() predicate.Predicate {
 			return operationNotSucceeded(event.Object)
 		},
 		UpdateFunc: func(event event.UpdateEvent) bool {
-			return operationNotSucceeded(event.ObjectNew)
+			return false
 		},
 		GenericFunc: func(event event.GenericEvent) bool {
-			return operationNotSucceeded(event.Object)
+			return false
 		},
 		DeleteFunc: func(event event.DeleteEvent) bool {
-			return operationNotSucceeded(event.Object)
+			return false
 		},
 	}
 }