Add spec.serverSide to allow configuring server-side apply - #344
Merged
brandond merged 1 commit intoJul 27, 2026
Merged
Conversation
brandond
force-pushed
the
fix-server-side-auto-force-conflicts
branch
from
July 27, 2026 22:06
870ee01 to
a51fd28
Compare
matttrach
approved these changes
Jul 27, 2026
vitorsavian
approved these changes
Jul 27, 2026
mgfritch
approved these changes
Jul 27, 2026
brandond
force-pushed
the
fix-server-side-auto-force-conflicts
branch
3 times, most recently
from
July 27, 2026 23:13
71fdeb9 to
730f5c4
Compare
Also moves --force-conflicts to env var, as klipper-helm image will need to do some inspection of the current chart release to see if it is safe to set the flag. Adds a test for .spec.serverSide=false and .spec.forceConflicts=true Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond
force-pushed
the
fix-server-side-auto-force-conflicts
branch
from
July 27, 2026 23:15
730f5c4 to
8fd3442
Compare
This was referenced Jul 27, 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
4 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.
Add spec.serverSide to allow configuring server-side apply
Also moves --force-conflicts to env var, as klipper-helm image will need to do some inspection of the current chart release to see if it is safe to set the flag.
Adds a test for .spec.serverSide=false and .spec.forceConflicts=true
Needs: