Skip to content

[oadp-1.6] OADP-7017: fix DPA error when podConfig has no nodeSelector with load…#2148

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:oadp-1.6from
openshift-cherrypick-robot:cherry-pick-2125-to-oadp-1.6
Apr 14, 2026
Merged

[oadp-1.6] OADP-7017: fix DPA error when podConfig has no nodeSelector with load…#2148
openshift-merge-bot[bot] merged 1 commit intoopenshift:oadp-1.6from
openshift-cherrypick-robot:cherry-pick-2125-to-oadp-1.6

Conversation

@openshift-cherrypick-robot
Copy link
Copy Markdown
Contributor

This is an automated cherry-pick of #2125

/assign weshayutin

…Affinity

The validator was incorrectly triggering an error whenever podConfig was
set (even with only resourceAllocations) alongside nodeAgent.loadAffinity
that used matchExpressions. The cross-validation between podConfig and
loadAffinityConfig should only run when podConfig.nodeSelector is
explicitly set, since that is the only field being compared.

Add a guard of len(PodConfig.NodeSelector) > 0 to the outer condition so
that a podConfig containing only resourceAllocations (or other non-selector
fields) is valid alongside any loadAffinity configuration.

Made-with: Cursor
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Mar 31, 2026

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

Details

In response to this:

This is an automated cherry-pick of #2125

/assign weshayutin

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
Contributor

coderabbitai bot commented Mar 31, 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: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: c829d912-8683-449f-9d61-6a43825215a7

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.

@weshayutin
Copy link
Copy Markdown
Contributor

/cherry-pick oadp-1.5

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

@weshayutin: once the present PR merges, I will cherry-pick it on top of oadp-1.5 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick oadp-1.5

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.

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 13, 2026
@kaovilai
Copy link
Copy Markdown
Member

/override ci/prow/4.18-ci-index ci/prow/4.18-images

@openshift-ci
Copy link
Copy Markdown

openshift-ci bot commented Apr 13, 2026

@kaovilai: Overrode contexts on behalf of kaovilai: ci/prow/4.18-ci-index, ci/prow/4.18-images

Details

In response to this:

/override ci/prow/4.18-ci-index ci/prow/4.18-images

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.

@kaovilai
Copy link
Copy Markdown
Member

/lgtm

@openshift-ci
Copy link
Copy Markdown

openshift-ci bot commented Apr 13, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kaovilai, openshift-cherrypick-robot, shubham-pampattiwar

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 [kaovilai,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 lgtm Indicates that a PR is ready to be merged. label Apr 13, 2026
@openshift-merge-bot
Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD a866c94 and 2 for PR HEAD 2121a85 in total

@openshift-ci
Copy link
Copy Markdown

openshift-ci bot commented Apr 14, 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 b3dea48 into openshift:oadp-1.6 Apr 14, 2026
18 checks passed
@openshift-cherrypick-robot
Copy link
Copy Markdown
Contributor Author

@weshayutin: new pull request created: #2164

Details

In response to this:

/cherry-pick oadp-1.5

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.

6 participants