Merge https://github.com/openshift/oadp-operator:oadp-1.3 (5c79560) into oadp-1.3 by oadp-rebasebot-app[bot] · Pull Request #2275 · openshift/oadp-operator

oadp-rebasebot-app · 2026-07-01T18:25:57Z

No description provided.

coderabbitai · 2026-07-01T18:26:10Z

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

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: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: d945db31-89b4-47f7-a0b7-07dfc143544c

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.}

openshift-ci · 2026-07-01T18:26:58Z

Hi @oadp-rebasebot-app[bot]. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

sseago · 2026-07-02T14:28:08Z

/lgtm

shubham-pampattiwar

/lgtm

openshift-merge-bot · 2026-07-02T17:24:29Z

/retest-required

Remaining retests: 0 against base HEAD 5c79560 and 2 for PR HEAD dc8b0d3 in total

kaovilai · 2026-07-02T17:29:06Z

/ok-to-test

weshayutin

/LGTM

weshayutin

/LGTM

weshayutin · 2026-07-06T21:14:21Z

/test unit-test

weshayutin · 2026-07-06T21:37:42Z

@Joeavaikath we need to update this pr w/

whayutin@fedora:~/OPENSHIFT/git/OADP/oadp-operator$ git diff
diff --git a/build/Dockerfile.bundle b/build/Dockerfile.bundle
index efc0abc3..afe53b2e 100644
--- a/build/Dockerfile.bundle
+++ b/build/Dockerfile.bundle
@@ -7,7 +7,7 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=oadp-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=stable-1.3
 LABEL operators.operatorframework.io.bundle.channel.default.v1=stable-1.3
-LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.34.2
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.35.0
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
 
diff --git a/bundle.Dockerfile b/bundle.Dockerfile
index efc0abc3..afe53b2e 100644
--- a/bundle.Dockerfile
+++ b/bundle.Dockerfile
@@ -7,7 +7,7 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=oadp-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=stable-1.3
 LABEL operators.operatorframework.io.bundle.channel.default.v1=stable-1.3
-LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.34.2
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.35.0
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
 
diff --git a/bundle/manifests/oadp-operator.clusterserviceversion.yaml b/bundle/manifests/oadp-operator.clusterserviceversion.yaml
index 1db990dc..a04fddce 100644
--- a/bundle/manifests/oadp-operator.clusterserviceversion.yaml
+++ b/bundle/manifests/oadp-operator.clusterserviceversion.yaml
@@ -173,7 +173,7 @@ metadata:
     operators.openshift.io/must-gather-image: quay.io/konveyor/oadp-must-gather:oadp-1.3
     operators.openshift.io/valid-subscription: '["OpenShift Kubernetes Engine", "OpenShift
       Container Platform", "OpenShift Platform Plus"]'
-    operators.operatorframework.io/builder: operator-sdk-v1.34.2
+    operators.operatorframework.io/builder: operator-sdk-v1.35.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/openshift/oadp-operator
     support: Red Hat
diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml
index 8471379a..d2e654d6 100644
--- a/bundle/metadata/annotations.yaml
+++ b/bundle/metadata/annotations.yaml
@@ -6,7 +6,7 @@ annotations:
   operators.operatorframework.io.bundle.package.v1: oadp-operator
   operators.operatorframework.io.bundle.channels.v1: stable-1.3
   operators.operatorframework.io.bundle.channel.default.v1: stable-1.3
-  operators.operatorframework.io.metrics.builder: operator-sdk-v1.34.2
+  operators.operatorframework.io.metrics.builder: operator-sdk-v1.35.0
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3

Joeavaikath · 2026-07-07T17:51:17Z

/hold will get updated after velero pr goes in
openshift/velero#539

weshayutin

/LGTM

weshayutin · 2026-07-07T23:05:48Z

/test unit-test

weshayutin · 2026-07-07T23:08:14Z

/retest-required

codecov-commenter · 2026-07-08T00:16:42Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 31.36%. Comparing base (e8ee8c5) to head (ea84418).
⚠️ Report is 85 commits behind head on oadp-1.3.

⚠️ Current head ea84418 differs from pull request most recent head f53db4e

Please upload reports for the commit f53db4e to get more accurate results.

Additional details and impacted files

@@             Coverage Diff              @@
##           oadp-1.3    #2275      +/-   ##
============================================
- Coverage     39.11%   31.36%   -7.75%     
============================================
  Files            18       28      +10     
  Lines          3068     4489    +1421     
============================================
+ Hits           1200     1408     +208     
- Misses         1731     2915    +1184     
- Partials        137      166      +29

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Joeavaikath · 2026-07-08T14:22:42Z

/retest

Joeavaikath · 2026-07-08T14:38:24Z

/unhold

openshift-merge-bot · 2026-07-08T16:19:18Z

/retest-required

Remaining retests: 0 against base HEAD 5c79560 and 2 for PR HEAD f53db4e in total

weshayutin · 2026-07-08T16:26:57Z

almost : ) "quay.io/openshift/ci:konveyor_builder_ubi9-v1.26" not found..

openshift-merge-bot · 2026-07-08T17:19:25Z

/retest-required

Remaining retests: 0 against base HEAD 42aedf0 and 1 for PR HEAD f53db4e in total

sseago · 2026-07-08T17:23:45Z

/lgtm

Joeavaikath · 2026-07-08T17:30:03Z

/retest

weshayutin · 2026-07-08T17:48:26Z

/retest

openshift-ci · 2026-07-08T18:05:49Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Joeavaikath, oadp-rebasebot-app[bot], shubham-pampattiwar, sseago, 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:

~~OWNERS~~ [Joeavaikath,shubham-pampattiwar,sseago]

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

Joeavaikath · 2026-07-08T18:19:37Z

Summary of CRD / Manifest Changes

The 26 changed CRD files are mirrored pairs across config/crd/bases/ and bundle/manifests/ (identical changes in both locations). These changes realign the Velero CRDs to match Velero v1.12.4, which is the upstream version oadp-1.3 is pinned to. A number of fields from newer Velero releases (v1.13+/v1.14+) had made their way into these CRDs and are being corrected.

controller-gen version bump

v0.16.5 → v0.17.0 across all CRDs (annotation only, tracks the generator version).

Velero API fields removed (not present in v1.12)

backuprepositories: repositoryConfig (spec), recentMaintenance (status)
backups / restores: uploaderConfig (parallel file upload/download settings), hookStatus (attempted/failed hook counts)
datadownloads / datauploads: nodeOS, acceptedByNode, acceptedTimestamp
podvolumebackups / podvolumerestores: uploaderSettings
downloadrequests: BackupVolumeInfos and RestoreVolumeInfo enum values
restores: waitForReady hook field

Other changes

x-kubernetes-list-type: atomic removed from label selector matchExpressions arrays in backups, restores, and schedules (controller-gen v0.17.0 no longer emits this for these fields)
ItemOperationTimeout default description corrected from "4 hour" to "1 hour" (backups + restores)
BSL SecretKeySelector.name: removed default: "" and trimmed backwards-compat description
BackupRepository.lastMaintenanceTime description updated
Restores spec now has required: [backupName]
podvolumebackups gained a Repository ID printer column

go.mod / go.sum

Dependency alignment to match the corrected Velero version and updated controller-gen tooling.

weshayutin · 2026-07-08T20:10:36Z

• [456.795 seconds]
------------------------------
[AfterSuite] 
/go/src/github.com/openshift/oadp-operator/tests/e2e/e2e_suite_test.go:157
  > Enter [AfterSuite] TOP-LEVEL - /go/src/github.com/openshift/oadp-operator/tests/e2e/e2e_suite_test.go:157 @ 07/08/26 19:56:31.152
2026/07/08 19:56:31 Deleting Velero CR
  < Exit [AfterSuite] TOP-LEVEL - /go/src/github.com/openshift/oadp-operator/tests/e2e/e2e_suite_test.go:157 @ 07/08/26 19:56:31.255 (104ms)
[AfterSuite] PASSED [0.104 seconds]
------------------------------

Ran 31 of 31 Specs in 4750.711 seconds
SUCCESS! -- 31 Passed | 0 Failed | 0 Pending | 0 Skipped
PASS

openshift-ci Bot requested review from savitharaghunathan and sseago July 1, 2026 18:26

openshift-ci Bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jul 1, 2026

sseago previously approved these changes Jul 2, 2026

View reviewed changes

openshift-ci Bot assigned sseago Jul 2, 2026

openshift-ci Bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jul 2, 2026

shubham-pampattiwar previously approved these changes Jul 2, 2026

View reviewed changes

openshift-ci Bot assigned shubham-pampattiwar Jul 2, 2026

openshift-ci Bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 2, 2026

weshayutin approved these changes Jul 6, 2026

View reviewed changes

openshift-ci Bot assigned weshayutin Jul 6, 2026

weshayutin previously approved these changes Jul 6, 2026

View reviewed changes

oadp-rebasebot-cloner Bot dismissed stale reviews from weshayutin, shubham-pampattiwar, and sseago via 27a47e1 July 7, 2026 17:49

oadp-rebasebot-cloner Bot force-pushed the rebase-bot-oadp-1.3 branch from dc8b0d3 to 27a47e1 Compare July 7, 2026 17:49

openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 7, 2026

openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 7, 2026

oadp-maintainers added 2 commits July 7, 2026 18:56

UPSTREAM: <drop>: Updating go modules

a541086

UPSTREAM: <drop>: update Velero CRDs @ oadp-1.3

2a1292e

UPSTREAM: <drop>: make bundle update

f53db4e

oadp-rebasebot-cloner Bot force-pushed the rebase-bot-oadp-1.3 branch from 27a47e1 to f53db4e Compare July 7, 2026 18:56

weshayutin previously approved these changes Jul 7, 2026

View reviewed changes

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 7, 2026

weshayutin mentioned this pull request Jul 7, 2026

Bump Go toolchain to 1.25.3 to fix covdata unit test failure #2290

Merged

3 tasks

openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 8, 2026

Merge branch 'oadp-1.3' into rebase-bot-oadp-1.3

70ed181

weshayutin dismissed their stale review via 70ed181 July 8, 2026 17:22

openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 8, 2026

sseago approved these changes Jul 8, 2026

View reviewed changes

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 8, 2026

Joeavaikath approved these changes Jul 8, 2026

View reviewed changes

shubham-pampattiwar approved these changes Jul 8, 2026

View reviewed changes

Joeavaikath mentioned this pull request Jul 8, 2026

Merge https://github.com/openshift/oadp-operator:oadp-1.4 (dbc2eda) into oadp-1.4 #2277

Open

weshayutin merged commit 059bc65 into openshift:oadp-1.3 Jul 8, 2026
7 of 9 checks passed

Uh oh!

Conversation

oadp-rebasebot-app Bot commented Jul 1, 2026

Uh oh!

coderabbitai Bot commented Jul 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

openshift-ci Bot commented Jul 1, 2026

Uh oh!

sseago commented Jul 2, 2026

Uh oh!

shubham-pampattiwar left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-merge-bot Bot commented Jul 2, 2026

Uh oh!

kaovilai commented Jul 2, 2026

Uh oh!

weshayutin left a comment

Choose a reason for hiding this comment

Uh oh!

weshayutin left a comment

Choose a reason for hiding this comment

Uh oh!

weshayutin commented Jul 6, 2026

Uh oh!

weshayutin commented Jul 6, 2026

Uh oh!

Joeavaikath commented Jul 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

weshayutin left a comment

Choose a reason for hiding this comment

Uh oh!

weshayutin commented Jul 7, 2026

Uh oh!

weshayutin commented Jul 7, 2026

Uh oh!

codecov-commenter commented Jul 8, 2026

Codecov Report

Uh oh!

Joeavaikath commented Jul 8, 2026

Uh oh!

Joeavaikath commented Jul 8, 2026

Uh oh!

openshift-merge-bot Bot commented Jul 8, 2026

Uh oh!

weshayutin commented Jul 8, 2026

Uh oh!

openshift-merge-bot Bot commented Jul 8, 2026

Uh oh!

sseago commented Jul 8, 2026

Uh oh!

Joeavaikath commented Jul 8, 2026

Uh oh!

weshayutin commented Jul 8, 2026

Uh oh!

openshift-ci Bot commented Jul 8, 2026

Uh oh!

Joeavaikath commented Jul 8, 2026

Summary of CRD / Manifest Changes

controller-gen version bump

Velero API fields removed (not present in v1.12)

Other changes

go.mod / go.sum

Uh oh!

weshayutin commented Jul 8, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

coderabbitai Bot commented Jul 1, 2026 •

edited

Loading

Joeavaikath commented Jul 7, 2026 •

edited

Loading