Change GitRepo deletion. #4361
Merged
Change GitRepo deletion. #4361
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
0xavi0
force-pushed
the
4192-gitrepo-delete-cascade
branch
from
a24d029 to
fcc8657
Compare
This PR introduces changes to how GitRepos are deleted, as well as their dependent resources. Two main changes are introduced: * The function that deletes the GitRepo has been modified to check for any pending resources, especially *Bundles* and *ImageScans*, since previously the *GitRepo* was removed before these resources were fully deleted. * A new controller is introduced for *Content* resources to track the number of *BundleDeployments* that reference the same one. This controller aims to eliminate the conflicts that occurred when updating or deleting *BundleDeployments*, as they were being updated or removed concurrently while modifying a shared *Content* resource. With these changes, the goal is to eliminate both update conflicts (which triggered additional Reconcile calls in the controllers) and potential race conditions when deleting and recreating *GitRepos* that still had dependent resources pending deletion. Signed-off-by: Xavi Garcia <[email protected]>
0xavi0
force-pushed
the
4192-gitrepo-delete-cascade
branch
from
fcc8657 to
f59b831
Compare
weyfonk
reviewed
Nov 27, 2025
Contributor
weyfonk
left a comment
weyfonk
left a comment
There was a problem hiding this comment.
This feels cleaner than the previous approach, if slightly more "manual".
Finalizers were not the right tool for the job, it seems :)
| bd.Spec.ValuesHash = valuesHash | ||
|
|
||
| // When content resources are stored in etcd, we need to keep track of the content resource so they | ||
| // are properly gargabe collected by the content controller. |
Contributor
There was a problem hiding this comment.
nit:
Suggested change
| // are properly gargabe collected by the content controller. | |
| // are properly garbage-collected by the content controller. |
Contributor
There was a problem hiding this comment.
I can still see this typo ;)
Contributor
Author
There was a problem hiding this comment.
I've searched at the whole project and I can't find it.
Contributor
There was a problem hiding this comment.
It still says "gargabe" instead of "garbage".
Contributor
Author
There was a problem hiding this comment.
will fix in a future PR, sorry for the confusion
0xavi0
force-pushed
the
4192-gitrepo-delete-cascade
branch
from
64317ed to
d46f405
Compare
Signed-off-by: Xavi Garcia <[email protected]>
0xavi0
force-pushed
the
4192-gitrepo-delete-cascade
branch
from
d46f405 to
d0d4dc6
Compare
weyfonk
reviewed
Nov 28, 2025
Signed-off-by: Xavi Garcia <[email protected]>
weyfonk
approved these changes
Nov 28, 2025
weyfonk
approved these changes
Nov 28, 2025
0xavi0
added a commit
to 0xavi0/fleet
that referenced
this pull request
Dec 1, 2025
* Change GitRepo deletion. This PR introduces changes to how GitRepos are deleted, as well as their dependent resources. Two main changes are introduced: * The function that deletes the GitRepo has been modified to check for any pending resources, especially *Bundles* and *ImageScans*, since previously the *GitRepo* was removed before these resources were fully deleted. * A new controller is introduced for *Content* resources to track the number of *BundleDeployments* that reference the same one. This controller aims to eliminate the conflicts that occurred when updating or deleting *BundleDeployments*, as they were being updated or removed concurrently while modifying a shared *Content* resource. With these changes, the goal is to eliminate both update conflicts (which triggered additional Reconcile calls in the controllers) and potential race conditions when deleting and recreating *GitRepos* that still had dependent resources pending deletion. --------- Signed-off-by: Xavi Garcia <[email protected]>
thardeck
pushed a commit
that referenced
this pull request
Dec 1, 2025
* Change GitRepo deletion. This PR introduces changes to how GitRepos are deleted, as well as their dependent resources. Two main changes are introduced: * The function that deletes the GitRepo has been modified to check for any pending resources, especially *Bundles* and *ImageScans*, since previously the *GitRepo* was removed before these resources were fully deleted. * A new controller is introduced for *Content* resources to track the number of *BundleDeployments* that reference the same one. This controller aims to eliminate the conflicts that occurred when updating or deleting *BundleDeployments*, as they were being updated or removed concurrently while modifying a shared *Content* resource. With these changes, the goal is to eliminate both update conflicts (which triggered additional Reconcile calls in the controllers) and potential race conditions when deleting and recreating *GitRepos* that still had dependent resources pending deletion. --------- Signed-off-by: Xavi Garcia <[email protected]>
This was referenced Dec 17, 2025
Closed
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This PR introduces changes to how GitRepos are deleted, as well as their dependent resources.
Two main changes are introduced:
The function that deletes the GitRepo has been modified to check for any pending resources, especially Bundles and ImageScans, since previously the GitRepo was removed before these resources were fully deleted.
A new controller is introduced for Content resources to track the number of BundleDeployments that reference the same one. This controller aims to eliminate the conflicts that occurred when updating or deleting BundleDeployments, as they were being updated or removed concurrently while modifying a shared Content resource.
With these changes, the goal is to eliminate both update conflicts (which triggered additional Reconcile calls in the controllers) and potential race conditions when deleting and recreating GitRepos that still had dependent resources pending deletion.
Refers to #4192
Refers to #4251
Additional Information
Checklist
- [ ] I have updated the documentation via a pull request in thefleet-docs repository.