Refresh the Thanos and promql-engine pins and document why they are pinned to main - #7788
Merged
CharlieTLe merged 3 commits intoSep 4, 2026
Conversation
dosubot
Bot
added
dependencies
CharlieTLe
force-pushed
the
release-1.22-pr-b-dependency-pins
branch
from
August 20, 2026 01:20
9c22591 to
d5ffaab
Compare
CharlieTLe
requested review from
a team and
SungJin1212
and removed request for
a team
August 20, 2026 19:08
…inned to main Both dependencies track main rather than a tag. Refresh them once here, ahead of the release-1.22 cut, and record in go.mod what each pin is actually needed for so the next shepherd does not have to re-derive it: - promql-engine has never cut a tag, so a pseudo-version is the only option. - The newest Thanos tag (v0.42.4) sits on a release branch that was never merged back to main, so it is behind what promql-engine needs to compile against. After this lands, no dependency bumps go to release-1.22 except security fixes. Signed-off-by: Charlie Le <charlie_le@apple.com>
CharlieTLe
force-pushed
the
release-1.22-pr-b-dependency-pins
branch
from
September 1, 2026 22:12
d5ffaab to
f34dfb1
Compare
SungJin1212
reviewed
Sep 3, 2026
Co-authored-by: SungJin1212 <tjdwls1201@gmail.com> Signed-off-by: Charlie Le <charlie_le@apple.com>
go mod vendor reindents the comment block above the thanos require line, which made the lint job's mod-check fail. Run go mod edit -fmt so the file matches canonical formatting. Signed-off-by: Charlie Le <charlie_le@apple.com>
SungJin1212
approved these changes
Sep 4, 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.
Groundwork for v1.22.0. Refresh both pins once here, ahead of the
release-1.22cut, andrecord in
go.modwhat each pin is needed for so the next shepherd does not have tore-derive it.
Why these stay on pseudo-versions
Re-pinning to released tags is not possible, and I checked rather than assumed:
promql-enginehas zero tags.git ls-remote --tagsreturns nothing. There is notag to pin to, now or ever. A pseudo-version is the only option.
v0.42.4, and it is not onmain. The0.42.xpatcheslive on a release branch that was never merged back. Downgrading would revert the
maincommits that
-querier.selector-batch-size(expose SelectorBatchSize config for Thanos engine #7763) andpkg/distributed_executioncompile against.
v1.21.x all did.
One incidental improvement: the old pin's base (
v0.42.1-0) sorted belowv0.42.4; thenew one (
v0.42.5-0) sorts above it, becausemainnow containsv0.42.4as an ancestor.After this lands
No dependency bumps go to
release-1.22after rc.0 except security fixes. If Thanos cutsv0.43.0before 09-07 it is worth evaluating, but it should not gate rc.0.Notes for the reviewer
#7740changelog entry ("Upgrade Thanos and promql-engine to latest") already coversthis refresh; I will append this PR's number to it rather than adding a new entry.
CHANGELOG.mdif that merges first — trivial to rebase.Verification
make mod-checkclean,go build ./...clean, andgo test ./...shows no new failures.