Skip to content

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

Open
openshift-cherrypick-robot wants to merge 1 commit intoopenshift:oadp-1.5from
openshift-cherrypick-robot:cherry-pick-2148-to-oadp-1.5
Open

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

Conversation

@openshift-cherrypick-robot
Copy link
Copy Markdown
Contributor

This is an automated cherry-pick of #2148

/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 Apr 14, 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 #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
@openshift-ci
Copy link
Copy Markdown

openshift-ci bot commented Apr 14, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: openshift-cherrypick-robot
Once this PR has been reviewed and has the lgtm label, please assign mpryc for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

@weshayutin
Copy link
Copy Markdown
Contributor

/retest

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants