feat(kubernetes): support --force-conflicts for kubectl Server-Side Apply via annotation #6111
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
…ants Signed-off-by: Priyanshu Harshbodhi <[email protected]>
…notation Signed-off-by: Priyanshu Harshbodhi <[email protected]>
Signed-off-by: Priyanshu Harshbodhi <[email protected]>
Author
|
@khanhtc1202 PTAL! |
Contributor
|
This PR is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 7 days. |
Contributor
|
This PR is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 7 days. |
Contributor
|
This PR was closed because it has been stalled for 7 days with no activity. Feel free to reopen if still applicable. |
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.
What this PR does:
Adds a new annotation
pipecd.dev/force-conflicts: "true".When used with
pipecd.dev/server-side-apply: "true", kubectl apply includes--force-conflicts.Why we need it:
SSA can fail on resources previously managed by Client-Side Apply due to field ownership conflicts.
--force-conflictsresolves conflicts by taking ownership, as recommended by kubectl’s error guidance.Which issue(s) this PR fixes:
Fixes #4639
Does this PR introduce a user-facing change?: