OCPBUGS-80948: update velero replace to track oadp-1.6 branch#227
OCPBUGS-80948: update velero replace to track oadp-1.6 branch#227jparrill wants to merge 2 commits intoopenshift:oadp-1.6from
Conversation
The go.mod replace directive for Velero was pointing to a stale pseudo-version on the oadp-1.5 branch (commit 8fbcf3a8da11, 2025-05-14). This caused Renovate/MintMaker PRs to fail because automated dependency updates resolved to incompatible upstream Velero versions that remove the v2alpha1 APIs the plugin depends on. Update the replace directive to track the oadp-1.6 branch (commit 216dd62a1caf, 2026-03-23) which is the correct upstream branch for the oadp-1.6 branch of hypershift-oadp-plugin. This picks up CVE fixes and bug fixes while maintaining API compatibility. Ref: https://redhat.atlassian.net/browse/OCPBUGS-80948 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Signed-off-by: Juan Manuel Parrilla Madrid <jparrill@redhat.com>
|
@jparrill: This pull request references Jira Issue OCPBUGS-80948, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
|
Important Review skippedAuto reviews are limited based on label configuration. 🚫 Review skipped — only excluded labels are configured. (1)
Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
The dependency tests and update script were checking against the main branch of hypershift, but oadp-1.6 should track release-4.21 instead. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Signed-off-by: Juan Manuel Parrilla Madrid <jparrill@redhat.com>
df55131 to
0aa9971
Compare
|
Please @kaovilai do you mind review the oadp version set in the Makefile vs the ocp release assigned?. |
|
/hold |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jparrill, kaovilai, weshayutin The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
@jparrill: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
What this PR does / why we need it
Updates the
go.modreplace directive for Velero from a stale pseudo-version on theoadp-1.5branch to the latest commit on theoadp-1.6branch, which is the correct upstream branch for theoadp-1.6release branch.Before:
After:
This fixes two problems:
v2alpha1APIs the plugin depends on.Additionally, sets the default
DEPS_UPSTREAM_BRANCHtorelease-4.21(instead ofmain) in the Makefile, dependency test, and update script, so that dependency validation checks against the correct hypershift upstream branch for the oadp-1.6 release.This is the follow-up for the
oadp-1.6branch from #224 (which fixedmain→oadp-dev).Which issue(s) this PR fixes
Fixes: OCPBUGS-80948
Checklist
🤖 Generated with Claude Code