[release-v1.34] Auto pick #3381: Fix deadlock where terminating resources were never #3385
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry pick of #3381 on release-v1.34.
#3381: Fix deadlock where terminating resources were never
Original PR Body below
Description
Originally spotted in this comment: projectcalico/calico#8368 (comment)
The operator only removes the CNI protector finalizers on these resources when the Installation is
Terminating
. However, in practice there are other scenarios that might result in these resources being deleted. In those cases, we should allow the deletion to complete and immmediately recreate them. Otherwise, they will be stuck terminating forever and be left in a broken state.Fixes projectcalico/calico#8368
For PR author
make gen-files
make gen-versions
For PR reviewers
A note for code reviewers - all pull requests must have the following:
kind/bug
if this is a bugfix.kind/enhancement
if this is a a new feature.enterprise
if this PR applies to Calico Enterprise only.