Skip to content

Refresh the Thanos and promql-engine pins and document why they are pinned to main - #7788

Open
CharlieTLe wants to merge 1 commit into
cortexproject:masterfrom
CharlieTLe:release-1.22-pr-b-dependency-pins
Open

Refresh the Thanos and promql-engine pins and document why they are pinned to main#7788
CharlieTLe wants to merge 1 commit into
cortexproject:masterfrom
CharlieTLe:release-1.22-pr-b-dependency-pins

Conversation

@CharlieTLe

Copy link
Copy Markdown
Member

Groundwork for v1.22.0. Refresh both pins once here, ahead of the release-1.22 cut, and
record in go.mod what each pin is needed for so the next shepherd does not have to
re-derive it.

thanos-io/thanos          v0.42.1-0.20260727122508-92397939e4cc -> v0.42.5-0.20260817064418-8908023d563b
thanos-io/promql-engine   v0.0.0-20260729073658-f8bd3f940687    -> v0.0.0-20260817205454-68fb2c2c5d9b

Why these stay on pseudo-versions

Re-pinning to released tags is not possible, and I checked rather than assumed:

  • promql-engine has zero tags. git ls-remote --tags returns nothing. There is no
    tag to pin to, now or ever. A pseudo-version is the only option.
  • The newest Thanos tag is v0.42.4, and it is not on main. The 0.42.x patches
    live on a release branch that was never merged back. Downgrading would revert the main
    commits that -querier.selector-batch-size (expose SelectorBatchSize config for Thanos engine #7763) and pkg/distributed_execution
    compile against.
  • Shipping on Thanos pseudo-versions is already the norm here — v1.19.0, v1.20.x and
    v1.21.x all did.

One incidental improvement: the old pin's base (v0.42.1-0) sorted below v0.42.4; the
new one (v0.42.5-0) sorts above it, because main now contains v0.42.4 as an ancestor.

After this lands

No dependency bumps go to release-1.22 after rc.0 except security fixes. If Thanos cuts
v0.43.0 before 09-07 it is worth evaluating, but it should not gate rc.0.

Notes for the reviewer

  • The #7740 changelog entry ("Upgrade Thanos and promql-engine to latest") already covers
    this refresh; I will append this PR's number to it rather than adding a new entry.
  • Conflicts with Curate the 1.22.0 changelog #7787 on CHANGELOG.md if that merges first — trivial to rebase.

Verification

make mod-check clean, go build ./... clean, and go test ./... shows no new failures.

@dosubot dosubot Bot added dependencies Pull requests that update a dependency file go Pull requests that update Go code sync-vendor labels Aug 20, 2026
…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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dependencies Pull requests that update a dependency file go Pull requests that update Go code size/S sync-vendor

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant