diff --git a/extensions/pkg/controller/backupbucket/controller.go b/extensions/pkg/controller/backupbucket/controller.go index 9653a77406f..6b699e08f3b 100644 --- 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 index 834e6ecd232..7617225c6cd 100644 --- 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 index 4162ccaa806..4ecfe55dc29 100644 --- 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 index e248e983789..f96b4cc29e5 100644 --- 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 index 6f223c910d7..17593a8e270 100644 --- 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 index c4c724be0e7..54f7664e836 100644 --- 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 index 1a06d683426..a4a388124c3 100644 --- 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 index b8a52a97fb3..736c610ccb0 100644 --- 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 index 63f6c3c08f6..52634bb5a79 100644 --- 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 index 751aba8acf2..6f3e4f8768e 100644 --- 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 }, } }