Skip to content

OCPBUGS-80948: update velero replace to track oadp-1.5 branch#228

Open
jparrill wants to merge 2 commits intoopenshift:oadp-1.5from
jparrill:OCPBUGS-80948-oadp-1-5
Open

OCPBUGS-80948: update velero replace to track oadp-1.5 branch#228
jparrill wants to merge 2 commits intoopenshift:oadp-1.5from
jparrill:OCPBUGS-80948-oadp-1-5

Conversation

@jparrill
Copy link
Copy Markdown
Contributor

What this PR does / why we need it

Updates the go.mod replace directive for Velero from a stale pseudo-version to the latest commit on the oadp-1.5 branch of openshift/velero.

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.20260317163839-1b8c9c4464d0

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 replace was ~10 months behind, missing CVE and bug fixes available on the oadp-1.5 branch.

This is the oadp-1.5 counterpart of #224 (which fixed main).

Which issue(s) this PR fixes

Fixes https://redhat.atlassian.net/browse/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

@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 to the latest commit on the oadp-1.5 branch of openshift/velero.

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.20260317163839-1b8c9c4464d0

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 replace was ~10 months behind, missing CVE and bug fixes available on the oadp-1.5 branch.

This is the oadp-1.5 counterpart of #224 (which fixed main).

Which issue(s) this PR fixes

Fixes https://redhat.atlassian.net/browse/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.

@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: fdb93b44-ff67-4739-9c0f-699c88a851a5

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 needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 30, 2026
@jparrill jparrill force-pushed the OCPBUGS-80948-oadp-1-5 branch from c716e8e to 2b6eb1c Compare March 30, 2026 07:34
@openshift-ci openshift-ci bot requested review from bryan-cox and celebdor March 30, 2026 07:35
@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 go.mod replace directive for Velero was pointing to a stale
pseudo-version (commit 8fbcf3a8da11, 2025-05-14). Update it to
track the oadp-1.5 branch of openshift/velero (commit 1b8c9c4464d0,
2026-03-17) which picks up CVE fixes and bug fixes while maintaining
API compatibility. Also bumps Go directive to 1.25.8.

Fixes: OCPBUGS-80948
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 jparrill force-pushed the OCPBUGS-80948-oadp-1-5 branch from 2b6eb1c to e9f691b Compare March 30, 2026 07:38
@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 30, 2026
@jparrill jparrill force-pushed the OCPBUGS-80948-oadp-1-5 branch from 24265ba to 1baf118 Compare March 30, 2026 08:04
@jparrill
Copy link
Copy Markdown
Contributor Author

Please @kaovilai do you mind review the oadp version set in the Makefile vs the ocp release assigned?

@jparrill jparrill force-pushed the OCPBUGS-80948-oadp-1-5 branch from 1baf118 to 4fd58d9 Compare March 30, 2026 09:10
The dependency tests and update script were checking against the main
branch of hypershift, but oadp-1.5 should track release-4.20 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-5 branch from 4fd58d9 to d3d0e90 Compare March 30, 2026 09:51
@openshift-ci
Copy link
Copy Markdown

openshift-ci bot commented Mar 30, 2026

@jparrill: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/build d3d0e90 link true /test build
ci/prow/verify d3d0e90 link true /test verify

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.

@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 openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 1, 2026
@openshift-ci
Copy link
Copy Markdown

openshift-ci bot commented Apr 1, 2026

PR needs rebase.

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.

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. 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. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants