fix: add --force-conflicts to helm deploy to resolve server-side apply conflict#1667
Merged
Merged
Conversation
…y ownership conflicts Helm 4 uses server-side apply which fails when fields were previously modified by kubectl-edit. Adding --force-conflicts allows Helm to take ownership of conflicting fields.
suyadav1
approved these changes
May 1, 2026
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
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.
problem:
helm chart deployment fails in this cluster https://github-private.visualstudio.com/microsoft/_build/results?buildId=116992&view=logs&j=e0d6c3c5-8898-56d1-7145-a67bdb7b228d&t=f00d8ec0-2a89-5ba3-6227-d5b730b66c7c
why:
Helm 4 uses server-side apply by default. Someone previously used kubectl edit to modify container images, making kubectl-edit the field manager. Helm can't overwrite fields owned by another manager without explicit permission.
fix:
Add --force-conflicts to helm upgrade arguments, allowing Helm to take ownership of conflicting fields.
test:
Ran helm upgrade --force-conflicts manually against ci-logs-prod-aks-geneva-integration-multi-tenancy — succeeded (revision 22).