Don't delete resources unless field managers match #3407
Conversation
This file contains 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
blampe
added
the
impact/no-changelog-required
Does the PR have any schema changes?Looking good! No breaking changes found. |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #3407 +/- ##
==========================================
+ Coverage 41.08% 41.12% +0.03%
==========================================
Files 87 87
Lines 12900 12917 +17
==========================================
+ Hits 5300 5312 +12
- Misses 7205 7208 +3
- Partials 395 397 +2 ☔ View full report in Codecov by Sentry. |
blampe
force-pushed
the
blampe/delete-after-create-field-manager
branch
from
0a9b5d5 to
4817d79
Compare
blampe
force-pushed
the
blampe/delete-after-create-field-manager
branch
from
4817d79 to
c0839d3
Compare
blampe
commented
Jan 4, 2025
| } | ||
| actualSSAManagers = actualSSAManagers.Insert(f.Manager) | ||
| } | ||
| if c.ServerSideApply && !actualSSAManagers.Has(c.FieldManager) { |
There was a problem hiding this comment.
As written this would also no-op in cases where the object was updated with CSA.
We can narrow this by also checking actualSSAManagers is non-empty, so we know the live object was at least touched by pulumi.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 fixes the delete-after-create problem by reviving #2999 using field managers (as Eron suggested) instead of annotations to confirm ownership before deleting a resource.
If the resource was created with SSA, and we don't find the expected field manager, then we no-op instead of deleting the resource. The intended effect is to remove it from our state so the "upserted" manager can continue owning it.
This is technically a breaking change in behavior for some edge cases, but I think it is justified by the potential severity of our delete-after-create bug.