Skip to content

[oadp-1.5] OADP-7882: add dpa config to disable early csi polling interval#2186

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:oadp-1.5from
openshift-cherrypick-robot:cherry-pick-2181-to-oadp-1.5
May 1, 2026
Merged

[oadp-1.5] OADP-7882: add dpa config to disable early csi polling interval#2186
openshift-merge-bot[bot] merged 1 commit intoopenshift:oadp-1.5from
openshift-cherrypick-robot:cherry-pick-2181-to-oadp-1.5

Conversation

@openshift-cherrypick-robot
Copy link
Copy Markdown
Contributor

This is an automated cherry-pick of #2181

/assign sseago

If not disabled, add env var to velero to enable early csi polling
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Apr 30, 2026

@openshift-cherrypick-robot: Ignoring requests to cherry-pick non-bug issues: OADP-7882

Details

In response to this:

This is an automated cherry-pick of #2181

/assign sseago

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 mpryc and sseago April 30, 2026 19:51
@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Apr 30, 2026

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: 0097e812-d0cd-4d65-b78f-3df19fab3362

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.

Copy link
Copy Markdown
Member

@shubham-pampattiwar shubham-pampattiwar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Apr 30, 2026
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Apr 30, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: openshift-cherrypick-robot, shubham-pampattiwar, 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 [shubham-pampattiwar]

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 30, 2026
@sseago
Copy link
Copy Markdown
Contributor

sseago commented Apr 30, 2026

/retest images

@sseago
Copy link
Copy Markdown
Contributor

sseago commented Apr 30, 2026

/test images

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD d72d663 and 2 for PR HEAD f7ca790 in total

@sseago
Copy link
Copy Markdown
Contributor

sseago commented Apr 30, 2026

/test images

@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented May 1, 2026

@openshift-cherrypick-robot: 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.

@openshift-merge-bot openshift-merge-bot Bot merged commit b113603 into openshift:oadp-1.5 May 1, 2026
14 checks passed
@sseago
Copy link
Copy Markdown
Contributor

sseago commented May 1, 2026

/cherry-pick oadp-1.4

@openshift-cherrypick-robot
Copy link
Copy Markdown
Contributor Author

@sseago: #2186 failed to apply on top of branch "oadp-1.4":

Applying: OADP-7882: add dpa config to disable early csi polling interval
Using index info to reconstruct a base tree...
A	api/v1alpha1/dataprotectionapplication_types.go
M	bundle/manifests/oadp.openshift.io_dataprotectionapplications.yaml
M	config/crd/bases/oadp.openshift.io_dataprotectionapplications.yaml
A	internal/controller/velero.go
A	internal/controller/velero_test.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/velero_test.go
CONFLICT (content): Merge conflict in controllers/velero_test.go
Auto-merging controllers/velero.go
Auto-merging config/crd/bases/oadp.openshift.io_dataprotectionapplications.yaml
CONFLICT (content): Merge conflict in config/crd/bases/oadp.openshift.io_dataprotectionapplications.yaml
Auto-merging bundle/manifests/oadp.openshift.io_dataprotectionapplications.yaml
CONFLICT (content): Merge conflict in bundle/manifests/oadp.openshift.io_dataprotectionapplications.yaml
CONFLICT (modify/delete): api/v1alpha1/dataprotectionapplication_types.go deleted in HEAD and modified in OADP-7882: add dpa config to disable early csi polling interval. Version OADP-7882: add dpa config to disable early csi polling interval of api/v1alpha1/dataprotectionapplication_types.go left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 OADP-7882: add dpa config to disable early csi polling interval

Details

In response to this:

/cherry-pick oadp-1.4

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. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants