chore: sync main into v2 (replaces #2748) - #2749
Closed
fseldow wants to merge 3 commits into
Closed
Conversation
fseldow
requested review from
akashsinghal,
binbin-li,
jimmyraywv,
luisdlp,
susanshi and
toddysm
as code owners
July 19, 2026 22:19
5 tasks
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
1 participant
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.
Description
Sync
mainintov2, replacing #2748.#2748 used
mainitself as the PR head branch, so resolving its conflicts would have added commits ontomain. This PR instead performs the merge on a dedicatedsync/main-to-v2-20260720branch, somainis never modified — it is only read.Conflict resolution
The only real conflict was in
helmfile.yaml.gotmpl(the notation cert / store scope block). Resolved by takingmain's corrected chart-schema values while keepingv2'sv2.0.0-alpha.2cert URL:notation.Certs[0](scalar) →notation.certs[0].cert+notation.certs[0].provider: inlinestores[0].scope(not read by the chart) →stores[0].credential.provider: static+ requiredexecutor.scopes[0]v2.0.0-alpha.2(v2 side)dev.helmfile.yaml.gotmpl,go.mod, andgo.summerged cleanly.Note on future syncs
To keep
mainuntouched, futuremain → v2syncs should use a dedicated branch as the PR head (base=v2, head=sync/...) rather than pointing the PR head atmaindirectly.