Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release-v1.5] Fix deletion case for extension predicates #2445

Merged
merged 1 commit into from Jun 15, 2020
Merged

[release-v1.5] Fix deletion case for extension predicates #2445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions extensions/pkg/controller/backupbucket/controller.go
View file
Open in desktop
Expand Up @@ -67,10 +67,6 @@ func DefaultPredicates(ignoreOperationAnnotation bool) []predicate.Predicate {
extensionspredicate.LastOperationNotSuccessful(),
extensionspredicate.IsDeleting(),
),
extensionspredicate.Or(
extensionspredicate.HasOperationAnnotation(),
predicate.GenerationChangedPredicate{},
),
}
}

Expand Down
4 changes: 0 additions & 4 deletions extensions/pkg/controller/backupentry/controller.go
View file
Open in desktop
Expand Up @@ -67,10 +67,6 @@ func DefaultPredicates(ignoreOperationAnnotation bool) []predicate.Predicate {
extensionspredicate.LastOperationNotSuccessful(),
extensionspredicate.IsDeleting(),
),
extensionspredicate.Or(
extensionspredicate.HasOperationAnnotation(),
predicate.GenerationChangedPredicate{},
),
}
}

Expand Down
4 changes: 0 additions & 4 deletions extensions/pkg/controller/containerruntime/controller.go
View file
Open in desktop
Expand Up @@ -77,10 +77,6 @@ func DefaultPredicates(ignoreOperationAnnotation bool) []predicate.Predicate {
extensionspredicate.IsDeleting(),
),
extensionspredicate.ShootNotFailed(),
extensionspredicate.Or(
extensionspredicate.HasOperationAnnotation(),
predicate.GenerationChangedPredicate{},
),
}
}

Expand Down
4 changes: 0 additions & 4 deletions extensions/pkg/controller/controlplane/controller.go
View file
Open in desktop
Expand Up @@ -67,10 +67,6 @@ func DefaultPredicates(ignoreOperationAnnotation bool) []predicate.Predicate {
extensionspredicate.IsDeleting(),
),
extensionspredicate.ShootNotFailed(),
extensionspredicate.Or(
extensionspredicate.HasOperationAnnotation(),
predicate.GenerationChangedPredicate{},
),
}
}

Expand Down
4 changes: 0 additions & 4 deletions extensions/pkg/controller/extension/reconciler.go
View file
Open in desktop
Expand Up @@ -91,10 +91,6 @@ func DefaultPredicates(ignoreOperationAnnotation bool) []predicate.Predicate {
extensionspredicate.IsDeleting(),
),
extensionspredicate.ShootNotFailed(),
extensionspredicate.Or(
extensionspredicate.HasOperationAnnotation(),
predicate.GenerationChangedPredicate{},
),
}
}

Expand Down
4 changes: 0 additions & 4 deletions extensions/pkg/controller/infrastructure/controller.go
View file
Open in desktop
Expand Up @@ -71,10 +71,6 @@ func DefaultPredicates(ignoreOperationAnnotation bool) []predicate.Predicate {
extensionspredicate.IsDeleting(),
),
extensionspredicate.ShootNotFailed(),
extensionspredicate.Or(
extensionspredicate.HasOperationAnnotation(),
predicate.GenerationChangedPredicate{},
),
}
}

Expand Down
4 changes: 0 additions & 4 deletions extensions/pkg/controller/network/controller.go
View file
Open in desktop
Expand Up @@ -67,10 +67,6 @@ func DefaultPredicates(ignoreOperationAnnotation bool) []predicate.Predicate {
extensionspredicate.IsDeleting(),
),
extensionspredicate.ShootNotFailed(),
extensionspredicate.Or(
extensionspredicate.HasOperationAnnotation(),
predicate.GenerationChangedPredicate{},
),
}
}

Expand Down
4 changes: 0 additions & 4 deletions extensions/pkg/controller/operatingsystemconfig/controller.go
View file
Open in desktop
Expand Up @@ -72,10 +72,6 @@ func DefaultPredicates(ignoreOperationAnnotation bool) []predicate.Predicate {
extensionspredicate.LastOperationNotSuccessful(),
extensionspredicate.IsDeleting(),
),
extensionspredicate.Or(
extensionspredicate.HasOperationAnnotation(),
predicate.GenerationChangedPredicate{},
),
}
}

Expand Down
4 changes: 0 additions & 4 deletions extensions/pkg/controller/worker/controller.go
View file
Open in desktop
Expand Up @@ -71,10 +71,6 @@ func DefaultPredicates(ignoreOperationAnnotation bool) []predicate.Predicate {
extensionspredicate.IsDeleting(),
),
extensionspredicate.ShootNotFailed(),
extensionspredicate.Or(
extensionspredicate.HasOperationAnnotation(),
predicate.GenerationChangedPredicate{},
),
}
}

Expand Down
8 changes: 4 additions & 4 deletions extensions/pkg/predicate/predicate.go
View file
Open in desktop
Expand Up @@ -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)
Expand All @@ -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
},
}
}
Expand Down