Skip to content

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

Merged
weshayutin merged 1 commit into
openshift:oadp-1.5from
openshift-cherrypick-robot:cherry-pick-2148-to-oadp-1.5
May 20, 2026
Merged

[oadp-1.5] OADP-7017: fix DPA error when podConfig has no nodeSelector with load…#2164
weshayutin merged 1 commit into
openshift:oadp-1.5from
openshift-cherrypick-robot:cherry-pick-2148-to-oadp-1.5

Conversation

@openshift-cherrypick-robot
Copy link
Copy Markdown
Contributor

@openshift-cherrypick-robot openshift-cherrypick-robot commented Apr 14, 2026

This is an automated cherry-pick of #2148

/assign weshayutin

@PrasadJoshi12
OADP-7017: fix DPA error when podConfig has no nodeSelector with load…
ff136e2 
…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-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Apr 14, 2026
Merged
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Apr 14, 2026 •
edited by openshift-ci Bot
Loading

@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 #2148

/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 Apr 14, 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: Pro Plus

Run ID: 64c857f6-7f86-4146-97ba-b7dea5c4636c

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 requested review from mpryc and mrnold April 14, 2026 02:41
@weshayutin
Copy link
Copy Markdown
Contributor

weshayutin commented Apr 14, 2026

/retest

1 similar comment
@weshayutin
Copy link
Copy Markdown
Contributor

weshayutin commented May 19, 2026

/retest

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 19, 2026
kaovilai
kaovilai approved these changes May 19, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@kaovilai kaovilai 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 May 19, 2026
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented May 19, 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
Copy link
Copy Markdown

openshift-ci Bot commented May 20, 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.

@weshayutin weshayutin merged commit ec209d6 into openshift:oadp-1.5 May 20, 2026
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kaovilai kaovilai kaovilai approved these changes

@shubham-pampattiwar shubham-pampattiwar shubham-pampattiwar approved these changes

@mpryc mpryc Awaiting requested review from mpryc

@mrnold mrnold Awaiting requested review from mrnold

Assignees

@weshayutin weshayutin

@kaovilai kaovilai

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@openshift-cherrypick-robot @openshift-ci-robot @weshayutin @kaovilai @shubham-pampattiwar @PrasadJoshi12