Skip to content

CORENET-6864: Ds merge 3/3/2026#280

Merged
openshift-merge-bot[bot] merged 13 commits intoopenshift:mainfrom
bpickard22:ds-merge-3/3/2026
Mar 4, 2026
Merged

CORENET-6864: Ds merge 3/3/2026#280
openshift-merge-bot[bot] merged 13 commits intoopenshift:mainfrom
bpickard22:ds-merge-3/3/2026

Conversation

@bpickard22
Copy link
Contributor

@bpickard22 bpickard22 commented Mar 3, 2026

This merge brings in upstream commits since the openshift/main divergence,
including:

  • CNI 1.1.0 STATUS support
  • CNI garbage collection functionality
  • DRA (Dynamic Resource Allocation) integration
  • Subdirectory CNI chaining support
  • passthru-cni implementation
  • Go 1.24.11 update (resolved conflict with openshift's 1.24.0)
  • Kubernetes 1.34 updates
  • Various bug fixes and improvements

Merge conflict resolution:

  • go.mod: Resolved Go version conflict by accepting upstream's 1.24.11
    (more specific than openshift/main's 1.24.0)

dependabot bot and others added 12 commits December 9, 2025 17:20
@dependabot
Bump github.com/containernetworking/plugins from 1.7.1 to 1.9.0
1d0c227 
Bumps [github.com/containernetworking/plugins](https://github.com/containernetworking/plugins) from 1.7.1 to 1.9.0.
- [Release notes](https://github.com/containernetworking/plugins/releases)
- [Commits](containernetworking/plugins@v1.7.1...v1.9.0)

---
updated-dependencies:
- dependency-name: github.com/containernetworking/plugins
  dependency-version: 1.9.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
@thomasferrandiz
Merge pull request #1464 from k8snetworkplumbingwg/dependabot/go_modu…
f29a370 
…les/github.com/containernetworking/plugins-1.9.0

Bump github.com/containernetworking/plugins from 1.7.1 to 1.9.0
@linuzctl
Fix typo: cilium spelling
0c108bd
@rollandf
chore: update Go version to 1.24.11
73dd0b4 
Fix several CVEs

Signed-off-by: Fred Rolland <frolland@nvidia.com>
@thomasferrandiz
Merge pull request #1467 from rollandf/go12411
39d6a8f 
chore: update Go version to 1.24.11
@SchSeba
Merge pull request #1465 from linuzctl/patch-1
9c05100 
Fix typo: cilium spelling
@trozet
Adds support for CNI STATUS
ea38900 
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>
@trozet
Update gateway-result handling for 1.1.0
e091897 
Signed-off-by: Tim Rozet <trozet@nvidia.com>
@trozet
Dynamically determine version for empty ADD result
921191d 
So that we can be compatible with 1.1.0.

Signed-off-by: Tim Rozet <trozet@nvidia.com>
@trozet
support GC for single-plugin delegates in CmdGC
56d18ef 
support only existed for confList before.

Signed-off-by: Tim Rozet <trozet@nvidia.com>
@trozet
thin_entrypoint: use conflist template for cniVersion >= 1.0.0
c943f9f 
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>
@bpickard22
Merge pull request #1470 from trozet/add_status_delegation
705a59e 
Adds support for CNI STATUS + other fixes for CNI Spec 1.1.0
@openshift-ci openshift-ci bot requested review from pliurh and s1061123 March 3, 2026 20:15
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 3, 2026
@bpickard22
Copy link
Contributor Author

bpickard22 commented Mar 3, 2026

have to revert the go.mod change back to 1.24.0, builder image is incompatible with upstream go version of 1.24.11 . we can handle the go bump in a separate pr later

@jluhrsen jluhrsen mentioned this pull request Mar 3, 2026
Open
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 3, 2026

@jluhrsen: This PR was included in a payload test run from openshift/origin#30560
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.22-e2e-aws-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/03ce5310-174d-11f1-8109-f196366c640e-0

@jluhrsen jluhrsen mentioned this pull request Mar 3, 2026
Closed
@bpickard22
Merge upstream multus-cni master into OpenShift main
ea2a3ae 
Merging k8snetworkplumbingwg/multus-cni master (commit 705a59e) into
openshift/multus-cni main.

This merge brings in upstream commits since the openshift/main divergence,
including:
- CNI 1.1.0 STATUS support
- CNI garbage collection functionality
- DRA (Dynamic Resource Allocation) integration
- Subdirectory CNI chaining support
- passthru-cni implementation
- Kubernetes 1.34 updates
- Various bug fixes and improvements

Merge conflict resolution:
- go.mod: Updated Go version from 1.24.0 to 1.24.2 to satisfy dependency
  requirements without requiring upstream's 1.24.11. This version (1.24.2)
  works with CI's Go 1.24.4 toolchain and passes 'go mod tidy' verification.
  Did not add toolchain directive to maintain CI compatibility with
  rhel-9-release-golang-1.24-openshift-4.20 builder image.

OpenShift-specific changes preserved in this merge:
1. OpenShift-only files:
   - .ci-operator.yaml (CI/CD configuration)
   - .snyk (security scanner exclusions)
   - Dockerfile.openshift (RHEL8/RHEL9 build)
   - Dockerfile.microshift (MicroShift build)
   - OWNERS (team ownership)
   - images/entrypoint.sh (OpenShift entrypoint with kubeconfig generation)

2. OpenShift code patches:
   - Kubeconfig certificate rotation handling (pkg/k8sclient/kubeconfig.go)
   - SAST filepath validation (cmd/multus-daemon/main.go, others)
   - Termination message policy (all daemonset YAMLs)

3. Upstream has incorporated these former OpenShift patches:
   - Pod not found handling in CNI ADD (upstream: 641f6a3)
   - Network status annotation tolerance (upstream: 5892d70)

Signed-off-by: Ben Pickard <bpickard@redhat.com>
Assisted by Claude Sonnet 4.5
Signed-off-by: Benjamin Pickard <bpickard@redhat.com>
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 4, 2026

@bpickard22: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/security ea2a3ae link false /test security

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.

@jluhrsen
Copy link

jluhrsen commented Mar 4, 2026

/lgtm

we had some failures in the ovnk d/s merge that are now resolved with this PR. here is an e2e job that ran w/ that ovnk d/s merge and it's passing.

/verified by https://prow.ci.openshift.org/view/gs/test-platform-results/logs/openshift-ovn-kubernetes-3011-openshift-multus-cni-280-openshift-origin-30820-openshift-origin-30560-ci-4.22-e2e-aws-ovn/2028954850829537280

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Mar 4, 2026
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Mar 4, 2026

@jluhrsen: This PR has been marked as verified by https://prow.ci.openshift.org/view/gs/test-platform-results/logs/openshift-ovn-kubernetes-3011-openshift-multus-cni-280-openshift-origin-30820-openshift-origin-30560-ci-4.22-e2e-aws-ovn/2028954850829537280.

Details

In response to this:

/lgtm

we had some failures in the ovnk d/s merge that are now resolved with this PR. here is an e2e job that ran w/ that ovnk d/s merge and it's passing.

/verified by https://prow.ci.openshift.org/view/gs/test-platform-results/logs/openshift-ovn-kubernetes-3011-openshift-multus-cni-280-openshift-origin-30820-openshift-origin-30560-ci-4.22-e2e-aws-ovn/2028954850829537280

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 added the lgtm Indicates that a PR is ready to be merged. label Mar 4, 2026
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 4, 2026

[APPROVALNOTIFIER] This PR is APPROVED

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

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

@jluhrsen
Copy link

jluhrsen commented Mar 4, 2026 •
edited by openshift-ci bot
Loading

/retitle CORENET-6864: Ds merge 3/3/2026

@openshift-ci openshift-ci bot changed the title Ds merge 3/3/2026 CORENET-6864: Ds merge 3/3/2026 Mar 4, 2026
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Mar 4, 2026
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Mar 4, 2026 •
edited by openshift-ci bot
Loading

@bpickard22: This pull request references CORENET-6864 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.22.0" version, but no target version was set.

Details

In response to this:

This merge brings in upstream commits since the openshift/main divergence,
including:

  • CNI 1.1.0 STATUS support
  • CNI garbage collection functionality
  • DRA (Dynamic Resource Allocation) integration
  • Subdirectory CNI chaining support
  • passthru-cni implementation
  • Go 1.24.11 update (resolved conflict with openshift's 1.24.0)
  • Kubernetes 1.34 updates
  • Various bug fixes and improvements

Merge conflict resolution:

  • go.mod: Resolved Go version conflict by accepting upstream's 1.24.11
    (more specific than openshift/main's 1.24.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.

@openshift-merge-bot openshift-merge-bot bot merged commit 0d343fe into openshift:main Mar 4, 2026
6 of 7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pliurh pliurh Awaiting requested review from pliurh

@s1061123 s1061123 Awaiting requested review from s1061123

Assignees

@jluhrsen jluhrsen

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. 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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@bpickard22 @jluhrsen @openshift-ci-robot @thomasferrandiz @linuzctl @rollandf @SchSeba @trozet