Repository navigation
fix(release): accept source charts from main and chart maintenance branches [nvcf-compute-plane 1.0] - #2989
Merged
kristinapathak merged 1 commit intoOct 29, 2026
Conversation
…anches [nvcf-compute-plane 1.0] Port of the chart release branch check from #2974 to the compute-plane 1.0 train. A patch on this train can pin a helm-nvca-operator version released after the train split from main, on main or on the chart's maintenance branch. That tag is not an ancestor of the stack commit, so the inventory rejected it. The inventory now also accepts a chart tag that origin/main or origin/release-<tag prefix>X.Y contains. Any other tag is still rejected. The snapshot lineage from #2971 and #2973 is not ported. This branch continues main's history instead of starting from a release snapshot, so chart tags released on main before the split are already ancestors of its stack commits. The docs sections that #2974 edits are not on this branch. Relates to #2970 Relates to #2972 Signed-off-by: Kristina Pathak <kpathak@nvidia.com> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. 🗂️ Base branches to auto review: 1
Please check the settings in the CodeRabbit UI or the
|
balajinvda
approved these changes
Oct 29, 2026
kristinapathak
merged commit Oct 29, 2026
735351c
into
release-deploy/stacks/nvcf-compute-plane/v1.0
16 checks passed
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
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.
TL;DR
Ports the chart release branch check from #2974 to the compute-plane 1.0 train. A patch on this train can pin a
helm-nvca-operatorversion released after the train split frommain. The stack inventory now accepts that chart tag whenorigin/mainor the chart's maintenance branch contains it, so the patch still gets its inventory.Additional Details
Why:
helm-nvca-operatorchart from its release tag,deploy/helm/nvca-operator/vX.Y.Z. It only accepts a tag that is an ancestor of the stack commit, the trust boundary from fix(release): generate self-managed stack inventory #1779.mainor from arelease-deploy/helm/nvca-operator/v1.Xbranch, would fail the inventory and publish without it. See ci(release): stack branch-cut opens a conflicting VERSION PR and the first train release has no inventory #2970 and ci(release): stack inventory rejects a patch that pins a chart released after the branch cut #2972.tools/docs-version-syncfrom the tagged commit, so the fix onmaindoes not reach tags on this branch.What changed:
docs-version-syncaccepts it whenorigin/mainororigin/release-<tag prefix>X.Yfor the tag's minor contains it. It logs that branch to stderr.chartReleaseBranchContainingis the same code as onmain.Not ported:
main's history, so chart tags released onmainbefore the split are already ancestors of its stack commits. A new test case covers that.docs/dev/github-release-process.mdon this branch predates the sections it edits.This changes nothing under
deploy/stacks/nvcf-compute-plane, so merging it does not cut a new stack patch. Not customer visible. No dependency changes.For the Reviewer
tools/docs-version-sync/resolved_inventory_publish.go: the ancestry check now falls back tochartReleaseBranchContaining.maininstead of a snapshot.For QA
go test ./...intools/docs-version-sync: pass.python3 tools/ci/test-github-release.py: pass (98 tests).go vet ./...,gofmt -l, andgit diff --check: clean.deploy/stacks/nvcf-compute-plane/v1.0.4tag (stack commitaae64c9a1):helm-nvca-operator1.28.0): pass, from the stack's own history.mainafter the split: pass with this change (using the release from origin/main). Before it, it fails withis not an ancestor of stack commit.release-deploy/helm/nvca-operator/v1.Xbranch exists yet, so the unit test covers the maintenance branch case.Issues
Relates to #2970
Relates to #2972
Checklist
🤖 Generated with Claude Code