Skip to content

[release-4.21] OCPBUGS-86416: set limits for aro.openshift.io/swift-nic in request overrides for ARO swift - #8565

Merged
openshift-merge-bot[bot] merged 2 commits into
openshift:release-4.21from
openshift-cherrypick-robot:cherry-pick-8552-to-release-4.21
May 26, 2026
Merged

openshift-merge-bot[bot] merged 2 commits into
openshift:release-4.21from
openshift-cherrypick-robot:cherry-pick-8552-to-release-4.21

Conversation

@openshift-cherrypick-robot

Copy link
Copy Markdown

This is an automated cherry-pick of #8552

/assign enxebre

enxebre and others added 2 commits May 21, 2026 07:16
…c in request overrides

The resource-request-override annotation only sets requests, but
extended resources like aro.openshift.io/swift-nic require limits
equal to requests. The API server rejects pods where an extended
resource has a request without a matching limit.

When the override includes aro.openshift.io/swift-nic, automatically
set the limit to the same value as the request.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
The enterprise contract check requires the prefetch-dependencies-oci-ta
task to have enable-package-registry-proxy set to true.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@coderabbitai

coderabbitai Bot commented May 21, 2026

Copy link
Copy Markdown
Contributor

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: aab9129f-6b71-4ee1-8582-31a03a899b05

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-robot

Copy link
Copy Markdown

@openshift-cherrypick-robot: An error was encountered cloning bug for cherrypick for bug OCPBUGS-86238 on the Jira server at https://redhat.atlassian.net. No known errors were detected, please see the full error message for details.

Full error message. request failed. Please analyze the request body for more details. Status code: 400: {"errorMessages":[],"errors":{"customfield_10414":"Field does not support update 'customfield_10414'","customfield_10427":"Field does not support update 'customfield_10427'","customfield_10428":"Field does not support update 'customfield_10428'","customfield_10429":"Field does not support update 'customfield_10429'","comment":"Field does not support update 'comment'","issuelinks":"Field does not support update 'issuelinks'","worklog":"Field does not support update 'worklog'","customfield_10430":"Field does not support update 'customfield_10430'","customfield_10431":"Field does not support update 'customfield_10431'"}}

Please contact an administrator to resolve this issue, then request a bug refresh with /jira refresh.

Details

In response to this:

This is an automated cherry-pick of #8552

/assign enxebre

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 jparrill and sjenning May 21, 2026 07:18
@openshift-ci openshift-ci Bot added area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release and removed do-not-merge/needs-area labels May 21, 2026
@celebdor celebdor changed the title [release-4.21] OCPBUGS-86238: set limits for aro.openshift.io/swift-nic in request overrides for ARO swift [release-4.21] OCPBUGS-86416: set limits for aro.openshift.io/swift-nic in request overrides for ARO swift May 22, 2026
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels May 22, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-86416, which is invalid:

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

This is an automated cherry-pick of #8552

/assign enxebre

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.

@celebdor celebdor added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels May 22, 2026
@enxebre

enxebre commented May 26, 2026

Copy link
Copy Markdown
Member

/approve
/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label May 26, 2026
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Scheduling required tests:
/test verify-deps

@openshift-ci

openshift-ci Bot commented May 26, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: enxebre, openshift-cherrypick-robot

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:

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 May 26, 2026
@enxebre enxebre added backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. and removed 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. labels May 26, 2026
@enxebre

enxebre commented May 26, 2026

Copy link
Copy Markdown
Member

/test e2e-aws-external-oidc
/test okd-scos-images

@enxebre enxebre added 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. labels May 26, 2026
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Scheduling required tests:
/test verify-deps

@enxebre

enxebre commented May 26, 2026

Copy link
Copy Markdown
Member

/verified by unit / e2e @enxebre

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label May 26, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@enxebre: This PR has been marked as verified by unit / e2e @enxebre.

Details

In response to this:

/verified by unit / e2e @enxebre

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-merge-bot

Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD 2a1af0d and 2 for PR HEAD 5b7f2de in total

@celebdor

Copy link
Copy Markdown
Collaborator

/retest-required

@openshift-ci

openshift-ci Bot commented May 26, 2026

Copy link
Copy Markdown
Contributor

@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 b5bc1c2 into openshift:release-4.21 May 26, 2026
18 checks passed
@openshift-ci-robot

Copy link
Copy Markdown

@openshift-cherrypick-robot: Jira Issue Verification Checks: Jira Issue OCPBUGS-86416
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-86416 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Details

In response to this:

This is an automated cherry-pick of #8552

/assign enxebre

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.

@enxebre

enxebre commented May 27, 2026

Copy link
Copy Markdown
Member

/cherry-pick release-4.20

@openshift-cherrypick-robot

Copy link
Copy Markdown
Author

@enxebre: #8565 failed to apply on top of branch "release-4.20":

Applying: fix(control-plane-operator): set limits for aro.openshift.io/swift-nic in request overrides
Applying: fix(tekton): enable package registry proxy in prefetch-dependencies task
Using index info to reconstruct a base tree...
A	.tekton/hypershift-operator-main-tag.yaml
A	.tekton/pipelines/common-operator-build.yaml
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): .tekton/pipelines/common-operator-build.yaml deleted in HEAD and modified in fix(tekton): enable package registry proxy in prefetch-dependencies task. Version fix(tekton): enable package registry proxy in prefetch-dependencies task of .tekton/pipelines/common-operator-build.yaml left in tree.
CONFLICT (modify/delete): .tekton/hypershift-operator-main-tag.yaml deleted in HEAD and modified in fix(tekton): enable package registry proxy in prefetch-dependencies task. Version fix(tekton): enable package registry proxy in prefetch-dependencies task of .tekton/hypershift-operator-main-tag.yaml 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 0002 fix(tekton): enable package registry proxy in prefetch-dependencies task

Details

In response to this:

/cherry-pick release-4.20

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.

celebdor added a commit to celebdor/hypershift that referenced this pull request May 27, 2026
…e limits

Add Azure CPO image overrides for 4.20 and 4.21 to fix the
aro.openshift.io/swift-nic extended resource limits not matching
requests, which causes Kubernetes pod admission failures.

4.22 does not need an override: the fix (PR openshift#8564, commit d6c72d1)
landed before rc.5 and will be included in the GA release.

- 4.20.0-4.20.24: OCPBUGS-86567 (PR openshift#8593 cherry-pick to release-4.20)
- 4.21.0-4.21.18: OCPBUGS-86416 (PR openshift#8565 cherry-pick to release-4.21)

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
dhgautam99 pushed a commit to dhgautam99/hypershift that referenced this pull request Jun 9, 2026
…e limits

Add Azure CPO image overrides for 4.20 and 4.21 to fix the
aro.openshift.io/swift-nic extended resource limits not matching
requests, which causes Kubernetes pod admission failures.

4.22 does not need an override: the fix (PR openshift#8564, commit d6c72d1)
landed before rc.5 and will be included in the GA release.

- 4.20.0-4.20.24: OCPBUGS-86567 (PR openshift#8593 cherry-pick to release-4.20)
- 4.21.0-4.21.18: OCPBUGS-86416 (PR openshift#8565 cherry-pick to release-4.21)

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
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. area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants