Skip to content

OCPBUGS-80948: update velero replace to track oadp-1.6 branch#227

Open
jparrill wants to merge 2 commits intoopenshift:oadp-1.6from
jparrill:OCPBUGS-80948-oadp-1-6
Open

OCPBUGS-80948: update velero replace to track oadp-1.6 branch#227
jparrill wants to merge 2 commits intoopenshift:oadp-1.6from
jparrill:OCPBUGS-80948-oadp-1-6

Conversation

@jparrill
Copy link
Copy Markdown
Contributor

@jparrill jparrill commented Mar 30, 2026

What this PR does / why we need it

Updates the go.mod replace directive for Velero from a stale pseudo-version on the oadp-1.5 branch to the latest commit on the oadp-1.6 branch, which is the correct upstream branch for the oadp-1.6 release branch.

Before:

replace github.com/vmware-tanzu/velero => github.com/openshift/velero v0.10.2-0.20250514165055-8fbcf3a8da11

After:

replace github.com/vmware-tanzu/velero => github.com/openshift/velero v0.10.2-0.20260323191807-216dd62a1caf

This fixes two problems:

  • Renovate/MintMaker failures: automated dependency updates resolved to incompatible upstream Velero versions (e.g. v1.2.0) that remove the v2alpha1 APIs the plugin depends on.
  • Missing CVE/bug fixes: the stale oadp-1.5 replace was ~10 months behind, missing CVE and bug fixes available on the oadp-1.6 branch.

Additionally, sets the default DEPS_UPSTREAM_BRANCH to release-4.21 (instead of main) 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.6 branch from #224 (which fixed mainoadp-dev).

Which issue(s) this PR fixes

Fixes: OCPBUGS-80948

Checklist

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes docs.
  • This change includes unit tests.

🤖 Generated with Claude Code

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>
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Mar 30, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@jparrill: This pull request references Jira Issue OCPBUGS-80948, which is invalid:

  • expected the bug to be open, but it isn't
  • expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Closed (Done) instead
  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
  • expected Jira Issue OCPBUGS-80948 to depend on a bug in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

What this PR does / why we need it

Updates the go.mod replace directive for Velero from a stale pseudo-version on the oadp-1.5 branch to the latest commit on the oadp-1.6 branch, which is the correct upstream branch for the oadp-1.6 release branch.

Before:

replace github.com/vmware-tanzu/velero => github.com/openshift/velero v0.10.2-0.20250514165055-8fbcf3a8da11

After:

replace github.com/vmware-tanzu/velero => github.com/openshift/velero v0.10.2-0.20260323191807-216dd62a1caf

This fixes two problems:

  • Renovate/MintMaker failures: automated dependency updates resolved to incompatible upstream Velero versions (e.g. v1.2.0) that remove the v2alpha1 APIs the plugin depends on.
  • Missing CVE/bug fixes: the stale oadp-1.5 replace was ~10 months behind, missing CVE and bug fixes available on the oadp-1.6 branch.

This is the follow-up for the oadp-1.6 branch from #224 (which fixed mainoadp-dev).

Which issue(s) this PR fixes

Fixes: OCPBUGS-80948

Checklist

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes docs.
  • This change includes unit tests.

🤖 Generated with Claude Code

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.

@openshift-ci openshift-ci bot requested review from bryan-cox and devguyio March 30, 2026 07:34
@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Mar 30, 2026

Important

Review skipped

Auto reviews are limited based on label configuration.

🚫 Review skipped — only excluded labels are configured. (1)
  • do-not-merge/work-in-progress

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 1ac28e7e-6297-458c-a91c-71c94615f62b

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands and usage tips.

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 30, 2026
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>
@jparrill jparrill force-pushed the OCPBUGS-80948-oadp-1-6 branch from df55131 to 0aa9971 Compare March 30, 2026 08:03
@jparrill
Copy link
Copy Markdown
Contributor Author

jparrill commented Mar 30, 2026

Please @kaovilai do you mind review the oadp version set in the Makefile vs the ocp release assigned?.
btw, I know I need to add the tests to the release repo. I will put a hold until that happens

@jparrill
Copy link
Copy Markdown
Contributor Author

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 30, 2026
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 30, 2026
@openshift-ci
Copy link
Copy Markdown

openshift-ci bot commented Mar 30, 2026

[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

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci
Copy link
Copy Markdown

openshift-ci bot commented Mar 31, 2026

@jparrill: all tests passed!

Full PR test history. Your PR dashboard.

Details

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 kubernetes-sigs/prow repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants