release: Reset charts to upstream branch#44411
Merged
joestringer merged 1 commit intomainfrom Feb 18, 2026
Merged
Conversation
Member
Author
|
@aanm could you confirm which branches we need this on? |
The reconciler couldn't resolve multiple merges at once because the reset command was just discarding uncommitted (dirty) changes to the local tree, and not resetting back to the upstream tree. What this needs to do is reset back to the tip of the default branch in the charts directory rather than just reverting back to the existing (unmergeable) commit. Fixes: 183559d ("workflows: Add retry logic for helm chart PR merge") Signed-off-by: Joe Stringer <joe@cilium.io>
39befcd to
ea5bd4e
Compare
Member
Author
|
/test |
viktor-kurchenko
approved these changes
Feb 18, 2026
Member
@joestringer none, the release workflow (and release tool) is meant to be available on main and work for any stable branch. |
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.
The reconciler couldn't resolve multiple merges at once because the
reset command was just discarding uncommitted (dirty) changes to the
local tree, and not resetting back to the upstream tree.
What this needs to do is reset back to the tip of the default branch in
the charts directory rather than just reverting back to the existing
(unmergeable) commit.
Fixes: #43585