[release-0.16] Add spec.serverSide to allow configuring server-side apply - #345
Merged
brandond merged 1 commit intoJul 27, 2026
Conversation
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> (cherry picked from commit 21a911f) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
mgfritch
approved these changes
Jul 27, 2026
matttrach
approved these changes
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
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.
Backport: