[release-4.21] OCPBUGS-82064: Bump CNI version to 1.1.0 by arkadeepsen · Pull Request #284 · openshift/multus-cni

arkadeepsen · 2026-04-08T17:14:38Z

Manual cherry-pick of ea38900 e091897 921191d 56d18ef c943f9f dfb8eaa 2a1b966. No conflicts.

Changes-Include: - Add STATUS handling for delegate requests and single‑plugin - Invoke STATUS for conf/conflist delegates via libcni - Preserve CNI error codes/messages through daemon API and shim - Add tests for STATUS error propagation Signed-off-by: Tim Rozet <trozet@nvidia.com> (cherry picked from commit ea38900)

Signed-off-by: Tim Rozet <trozet@nvidia.com> (cherry picked from commit e091897)

So that we can be compatible with 1.1.0. Signed-off-by: Tim Rozet <trozet@nvidia.com> (cherry picked from commit 921191d)

support only existed for confList before. Signed-off-by: Tim Rozet <trozet@nvidia.com> (cherry picked from commit 56d18ef)

Fix thin auto-config generation to select 00-multus.conflist for all CNI versions >= 1.0.0 (not only exact 1.0.0) Signed-off-by: Tim Rozet <trozet@nvidia.com> (cherry picked from commit c943f9f)

openshift-ci-robot · 2026-04-08T17:14:42Z

@arkadeepsen: This pull request explicitly references no jira issue.

Details

In response to this:

Manual cherry-pick of ea38900 e091897 921191d 56d18ef c943f9f. No conflicts.

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 · 2026-04-08T17:14:46Z

Important

Review skipped

Auto reviews are limited based on label configuration.

🚫 Review skipped — only excluded labels are configured. (1)

do-not-merge/work-in-progress

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: 47e4d02f-f1e2-4be6-888a-be0063728919

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

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

openshift-ci · 2026-04-08T17:16:40Z

@arkadeepsen: This PR was included in a payload test run from openshift/ovn-kubernetes#3087
trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-release-main-ci-4.21-e2e-aws-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/b24e2180-336e-11f1-8eef-893f056ce8e5-0

openshift-ci-robot · 2026-04-08T20:51:26Z

@arkadeepsen: This pull request references Jira Issue OCPBUGS-82064, which is invalid:

expected dependent Jira Issue OCPBUGS-82046 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is POST instead

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:

Manual cherry-pick of ea38900 e091897 921191d 56d18ef c943f9f. No conflicts.

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.

bpickard22 · 2026-04-10T16:30:07Z

https://github.com/k8snetworkplumbingwg/multus-cni/pull/1490/commits need these commits as well @arkadeepsen

STATUS and GC are plugin-level commands with no pod context per the CNI 1.1.0 spec. The thick plugin daemon incorrectly required CNI_CONTAINERID, CNI_NETNS, and K8S_POD_NAME/K8S_POD_NAMESPACE for these commands, causing failures when invoked by kubelet. Signed-off-by: Jason Kary <jkary@redhat.com> (cherry picked from commit dfb8eaa)

- Check os.OpenFile error in STATUS/GC test - Document that k8sArgs may be nil for STATUS/GC in HandleCNIRequest Made-with: Cursor (cherry picked from commit 2a1b966)

openshift-ci · 2026-04-10T17:02:55Z

@arkadeepsen: This PR was included in a payload test run from openshift/ovn-kubernetes#3087
trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-release-main-ci-4.21-e2e-aws-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/1aba7c50-34ff-11f1-8881-f5621743b1c0-0

bpickard22 · 2026-04-10T17:14:13Z

/approve

bpickard22 · 2026-04-10T17:14:54Z

/label backport-risk-assessed

arkadeepsen · 2026-04-13T06:07:44Z

/jira refresh

openshift-ci-robot · 2026-04-13T06:07:51Z

@arkadeepsen: This pull request references Jira Issue OCPBUGS-82064, which is valid.

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.21.z) matches configured target version for branch (4.21.z)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
release note text is set and does not match the template
dependent bug Jira Issue OCPBUGS-82046 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
dependent Jira Issue OCPBUGS-82046 targets the "4.22.0" version, which is one of the valid target versions: 4.22.0
bug has dependents

Details

In response to this:

/jira refresh

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 · 2026-04-13T09:33:04Z

@arkadeepsen: This PR was included in a payload test run from openshift/ovn-kubernetes#3087
trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-release-main-ci-4.21-e2e-aws-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/c1cb8020-371b-11f1-8314-beaf8a27bf87-0

arkadeepsen · 2026-04-13T11:26:41Z

/retest-required

openshift-ci · 2026-04-13T14:31:55Z

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

arkadeepsen · 2026-04-13T14:44:06Z

/verified by https://pr-payload-tests.ci.openshift.org/runs/ci/c1cb8020-371b-11f1-8314-beaf8a27bf87-0

openshift-ci-robot · 2026-04-13T14:44:19Z

@arkadeepsen: This PR has been marked as verified by https://pr-payload-tests.ci.openshift.org/runs/ci/c1cb8020-371b-11f1-8314-beaf8a27bf87-0.

Details

In response to this:

/verified by https://pr-payload-tests.ci.openshift.org/runs/ci/c1cb8020-371b-11f1-8314-beaf8a27bf87-0

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.

bpickard22 · 2026-04-13T15:49:09Z

/lgtm

openshift-ci · 2026-04-13T15:49:35Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: arkadeepsen, bpickard22

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~~ [bpickard22]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-ci-robot · 2026-04-13T15:52:11Z

@arkadeepsen: Jira Issue OCPBUGS-82064: Some pull requests linked via external trackers have merged:

The following pull request, linked via external tracker, has not merged:

openshift/origin#30977 is open

All associated pull requests must be merged or unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

Jira Issue OCPBUGS-82064 has not been moved to the MODIFIED state.

This PR is marked as verified. If the remaining PRs listed above are marked as verified before merging, the issue will automatically be moved to VERIFIED after all of the changes from the PRs are available in an accepted nightly payload.

Details

In response to this:

Manual cherry-pick of ea38900 e091897 921191d 56d18ef c943f9f dfb8eaa 2a1b966. No conflicts.

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-robot · 2026-04-14T22:01:27Z

Fix included in release 4.21.0-0.nightly-2026-04-14-123546

trozet added 5 commits April 8, 2026 22:42

Update gateway-result handling for 1.1.0

59ac967

Signed-off-by: Tim Rozet <trozet@nvidia.com> (cherry picked from commit e091897)

Dynamically determine version for empty ADD result

a7e071c

So that we can be compatible with 1.1.0. Signed-off-by: Tim Rozet <trozet@nvidia.com> (cherry picked from commit 921191d)

support GC for single-plugin delegates in CmdGC

4d314b5

support only existed for confList before. Signed-off-by: Tim Rozet <trozet@nvidia.com> (cherry picked from commit 56d18ef)

thin_entrypoint: use conflist template for cniVersion >= 1.0.0

519a4fd

Fix thin auto-config generation to select 00-multus.conflist for all CNI versions >= 1.0.0 (not only exact 1.0.0) Signed-off-by: Tim Rozet <trozet@nvidia.com> (cherry picked from commit c943f9f)

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 8, 2026

openshift-ci Bot requested review from bpickard22 and pliurh April 8, 2026 17:15

arkadeepsen mentioned this pull request Apr 8, 2026

OCPBUGS-83566: Branch Sync release-4.22 to release-4.21 [03-25-2026] openshift/ovn-kubernetes#3087

Merged

arkadeepsen changed the title ~~[release-4.21] NO-JIRA: Bump CNI version to 1.1.0~~ [release-4.21] OCPBUGS-82064: Bump CNI version to 1.1.0 Apr 8, 2026

openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Apr 8, 2026

jkary and others added 2 commits April 10, 2026 22:28

Address PR review nits from pliurh

d87161a

- Check os.OpenFile error in STATUS/GC test - Document that k8sArgs may be nil for STATUS/GC in HandleCNIRequest Made-with: Cursor (cherry picked from commit 2a1b966)

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 10, 2026

openshift-ci Bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Apr 10, 2026

openshift-ci Bot assigned anuragthehatter, asood-rh, barbora137, jechen0648, mffiedler, rbbratta and weliang1 Apr 10, 2026

jluhrsen mentioned this pull request Apr 11, 2026

[release-4.21] OCPBUGS-82064: Assert CNI version greater than equal to 1.0.0 openshift/origin#30977

Merged

openshift-ci-robot 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 Apr 13, 2026

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Apr 13, 2026

openshift-ci Bot assigned bpickard22 Apr 13, 2026

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Apr 13, 2026

openshift-merge-bot Bot merged commit 4f696e7 into openshift:release-4.21 Apr 13, 2026
7 of 8 checks passed

arkadeepsen deleted the bump-cni-version-4.21 branch April 13, 2026 16:04

Conversation

arkadeepsen commented Apr 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Apr 8, 2026

Uh oh!

coderabbitai Bot commented Apr 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

openshift-ci Bot commented Apr 8, 2026

Uh oh!

openshift-ci-robot commented Apr 8, 2026

Uh oh!

bpickard22 commented Apr 10, 2026

Uh oh!

openshift-ci Bot commented Apr 10, 2026

Uh oh!

bpickard22 commented Apr 10, 2026

Uh oh!

bpickard22 commented Apr 10, 2026

Uh oh!

arkadeepsen commented Apr 13, 2026

Uh oh!

openshift-ci-robot commented Apr 13, 2026

Uh oh!

openshift-ci Bot commented Apr 13, 2026

Uh oh!

arkadeepsen commented Apr 13, 2026

Uh oh!

openshift-ci Bot commented Apr 13, 2026

Uh oh!

arkadeepsen commented Apr 13, 2026

Uh oh!

openshift-ci-robot commented Apr 13, 2026

Uh oh!

bpickard22 commented Apr 13, 2026

Uh oh!

openshift-ci Bot commented Apr 13, 2026

Uh oh!

Uh oh!

openshift-ci-robot commented Apr 13, 2026

Uh oh!

openshift-merge-robot commented Apr 14, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

14 participants

arkadeepsen commented Apr 8, 2026 •

edited

Loading

coderabbitai Bot commented Apr 8, 2026 •

edited

Loading