Add go-mod-reconcile-upstream hook to kopia oadp-1.4 config - #149
Merged
Joeavaikath merged 2 commits intoJul 15, 2026
Merged
Conversation
The reconcile hook compares go.mod require versions against the upstream source and bumps any that were downgraded during rebase. Without it, prometheus/common was stuck at v0.44.0 (vs upstream v0.52.3), causing build failures in oadp-must-gather due to the missing expfmt.NewFormat API added in v0.46.0. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: defaults Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (28)
📝 WalkthroughWalkthroughChangesPost-rebase hook wiring
Estimated code review effort: 2 (Simple) | ~10 minutes Possibly related issues
Possibly related PRs
Suggested reviewers: 🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
Adds the reconcile hook before go-mod-tidy-and-commit in every config that rebases from a real upstream (source != dest). Hooks-only configs (source == dest) are excluded since there is no upstream go.mod to reconcile against. Repos covered: kopia (1.3/1.5/1.6/dev), kubevirt-velero-plugin (main/1.3-1.6), oadp-vmdp (1.6/dev), velero-plugin-for-aws (1.3-1.6/dev), velero-plugin-for-csi (1.3), velero-plugin-for-gcp (1.3-1.6/dev), velero-plugin-for-microsoft-azure (1.3-1.6/dev). Velero configs already had it; kopia 1.4 was added in the prior commit. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
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.
Summary
go-mod-reconcile-upstream.shpost-rebase hook to the kopia oadp-1.4 config, running beforego-mod-tidy-and-commit.shprometheus/commonversion drift (v0.44.0→v0.52.3) that causedoadp-must-gatherbuild failures due to the missingexpfmt.NewFormatAPIContext
The oadp-must-gather oadp-1.4 images build was failing in CI because
migtools/kopia:oadp-1.4hadprometheus/commonatv0.44.0, while the upstream code fromv0.17.0-velero.1requiresv0.52.3for theexpfmt.NewFormat()API (added inv0.46.0). The version was downgraded during rebase because downstream carry commits pinned older dependency versions, andgo mod tidyresolved to the lower version without the reconcile hook to enforce upstream minimums.Test plan
/ok-to-test🤖 Generated with Claude Code
Summary by CodeRabbit