Add support for helm --force-conflicts to address field ownership conflicts - #341
Merged
Conversation
mgfritch
approved these changes
Jul 21, 2026
mgfritch
left a comment
mgfritch
left a comment
There was a problem hiding this comment.
tiny lint failure, but otherwise lgtm!
Adding this to HelmChartConfig as end users may need to enable it when using HelmChartConfig to set values for bundled charts. Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Adds a new failure policy that attempts to retry the install or upgrade operation, instead of either uninstalling and reinstalling, or just halting. Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond
force-pushed
the
ssa-force-conflicts
branch
from
July 22, 2026 00:00
248b162 to
9013e05
Compare
mgfritch
approved these changes
Jul 22, 2026
matttrach
approved these changes
Jul 22, 2026
This was referenced Jul 22, 2026
Merged
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
3 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.
With Helm v4, helm now uses server-side apply by default, which respects field ownership.
In the case of conflicts, helm will put the new release into the
failedstatus, with a note about what resources and fields conflicted.This adds support for setting the
--force-conflictsoption, which tells Helm to ignore ownership conflicts, and just take over the conflicting fields. This is similar to--take-ownership, but at a field-manager level.This also adds support for
retryfailure policy, to recover from upgrades that have failed due to conflicting field ownership, without having to manually correct the failure, or suffer helm-controller uninstalling and reinstalling the entire chart. This may be the default policy in the future.For:
Needs: