github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2026-02-21 14:42:03 +00:00
Code Issues Projects Releases Wiki Activity
993 Commits 10 Branches 36 Tags
master
Commit Graph

993 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Pickard
705a59eaf9 Merge pull request #1470 from trozet/add_status_delegation 
Adds support for CNI STATUS + other fixes for CNI Spec 1.1.0
v4.2.4 		2026-02-17 15:22:32 -05:00
Tim Rozet
c943f9ffa2 thin_entrypoint: use conflist template for cniVersion >= 1.0.0 
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>
 2026-02-13 14:23:57 -05:00
Tim Rozet
56d18efde0 support GC for single-plugin delegates in CmdGC 
support only existed for confList before.

Signed-off-by: Tim Rozet <trozet@nvidia.com>
 2026-02-13 14:17:41 -05:00
Tim Rozet
921191dece Dynamically determine version for empty ADD result 
So that we can be compatible with 1.1.0.

Signed-off-by: Tim Rozet <trozet@nvidia.com>
 2026-02-13 13:55:00 -05:00
Tim Rozet
e091897b4c Update gateway-result handling for 1.1.0 
Signed-off-by: Tim Rozet <trozet@nvidia.com>
 2026-02-13 13:48:35 -05:00
Tim Rozet
ea389005a1 Adds support for CNI STATUS 
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>
 2026-02-13 13:32:26 -05:00
Sebastian Scheinkman
9c05100972 Merge pull request #1465 from linuzctl/patch-1 
Fix typo: cilium spelling
 2026-01-14 10:49:53 +02:00
thomasferrandiz
39d6a8ffd2 Merge pull request #1467 from rollandf/go12411 
chore: update Go version to 1.24.11
 2025-12-24 09:55:51 +01:00
Fred Rolland
73dd0b4c3b chore: update Go version to 1.24.11 
Fix several CVEs

Signed-off-by: Fred Rolland <frolland@nvidia.com>
 2025-12-23 15:13:56 +02:00
linuzctl
0c108bd0fc Fix typo: cilium spelling 2025-12-21 20:50:46 +01:00
thomasferrandiz
f29a370f8e Merge pull request #1464 from k8snetworkplumbingwg/dependabot/go_modules/github.com/containernetworking/plugins-1.9.0 
Bump github.com/containernetworking/plugins from 1.7.1 to 1.9.0
 2025-12-11 11:44:26 +01:00
dependabot[bot]
1d0c2272db Bump github.com/containernetworking/plugins from 1.7.1 to 1.9.0 
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](https://github.com/containernetworking/plugins/compare/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>
 2025-12-09 17:20:01 +00:00
thomasferrandiz
f42e0bd8fa Merge pull request #1443 from yingwang-0320/CORENET-6353 
Bump Multus to Kube 1.34
 2025-11-12 09:52:57 +01:00
Jan Untersander
173fdf538a Allow for more time in setup of kind cluster in e2e test 2025-11-05 21:01:20 -05:00
Jan Untersander
71d42a1baf Change thick initContainer to use install_multus 2025-11-05 21:01:03 -05:00
“yingwang-0320”
fc3053fc6d Bump Multus to Kube 1.34 
Signed-off-by: “yingwang-0320” <yingwang@redhat.com>
 2025-11-05 01:47:24 -05:00
thomasferrandiz
2ecd4f4b47 Merge pull request #1445 from Untersander/fix/use-multus-install 
Fix node reboot issue by using install_multus bin to update cni file
v4.2.3 		2025-10-30 15:32:53 +01:00
thomasferrandiz
cdf603f4db Merge pull request #1451 from thomasferrandiz/bump-go-1.24 
Bump to go 1.24
 2025-10-24 09:51:37 +02:00
Thomas Ferrandiz
7489eea315 Fix url in generated kubeconfig file 2025-10-23 12:37:22 +00:00
Thomas Ferrandiz
369722ba7f Fix formatting as required by go vet 2025-10-16 15:01:31 +00:00
Thomas Ferrandiz
34e6dff08f Bump to go 1.24 2025-10-13 08:46:49 +00:00
Jan Untersander
8cf05dac81 Allow for more time in setup of kind cluster in e2e test 2025-09-28 12:19:22 +02:00
Jan Untersander
a234ce68f3 Change thick initContainer to use install_multus 2025-09-28 11:54:17 +02:00
Ben Pickard
00adf22482 Merge pull request #1435 from thomasferrandiz/fix-config-error-msg 
Add error message when the config is missing at startup
v4.2.2 		2025-07-03 09:39:42 -04:00
Thomas Ferrandiz
f6b42791b5 Add error message when the config is missing at startup 2025-07-03 12:04:54 +00:00
Ben Pickard
6dd955dba5 Merge pull request #1431 from Nordix/bump-all/adil 
Update to go 1.23 and k8s version 1.32.5
 2025-07-01 16:47:36 -04:00
Muhammad Adil Ghaffar
f18d96b648 update to go 1.23 and latest k8s version (1.32.5) 
Signed-off-by: Muhammad Adil Ghaffar <muhammad.adil.ghaffar@est.tech>
 2025-06-24 15:11:16 +03:00
Doug Smith
18630fde0b Merge pull request #1424 from nirdothan/mount-multus-conf-dir 
Thick client: mount multus-conf-dir
v4.2.1 		2025-05-13 08:32:26 -04:00
Nir Dothan
19f9283db4 Thick client: mount multus-conf-dir 
Currently, the default CNI config dir is /etc/cni/multus/net.d [1].
However, pods do not mount this hostPath.
This issue only occurs when a delegate network-attachment-definition
has no spec, and it therefore needs to be loaded from disk[2].
For example, when deploying Istio-cni in multus mode,
the deployment creates an empty Istio-cni NAD in default namespace, while
the actual config is deployed on disk.
CmdAdd fails with the following error message:
GetNetworkDelegates: failed getting the delegate: GetCNIConfig:
err in GetCNIConfigFromFile: No networks found in /etc/cni/multus/net.d

[[1]](https://github.com/k8snetworkplumbingwg/multus-cni/blob/v4.2.0/pkg/types/conf.go#L38)
[[2]](https://github.com/k8snetworkplumbingwg/multus-cni/blob/v4.2.0/pkg/k8sclient/k8sclient.go#L506)

Signed-off-by: Nir Dothan <ndothan@redhat.com>
 2025-05-05 17:45:52 +03:00
Doug Smith
1655d540cb Merge pull request #1418 from rollandf/baseimage 
chore: update Dockerfile base image
 2025-04-24 15:43:05 +02:00
Ben Pickard
4517063b79 Merge pull request #1419 from dougbtv/rebase5-cni-subdirectory-chain 
Safe subdirectory based CNI chain configuration loading
 2025-04-16 16:04:18 -04:00
dougbtv
4104fea90d Subdirectory CNI chain loading e2e tests 
Adds a test for plain subdirectory chaining and also using passthru CNI with auxiliaryCNIChainName
 2025-04-15 15:53:18 -04:00
dougbtv
528d4f150c Functionality for Aux CNI Chain using subdirectory based CNI configuration loading. 
Removes the it `fails to execute confListDel given no 'plugins' key"` test.

This test no longer fails after libcni version 1.2.3.
It probably shouldn't failduring a DEL action as it is, we want the least error prone path.

The GC test now uses both cni.dev attachment formats.

Uses both attachment formats as per https://github.com/containernetworking/cni/issues/1101 for GC's cni.dev/valid-attachments & cni.dev/attachments
 2025-04-15 15:53:00 -04:00
dougbtv
fa3c7cfee3 [bump] Bumps to libcni v1.3.0 2025-04-09 14:42:47 -04:00
Fred Rolland
96bfb26dac chore: update Dockerfile base image 
- Fix CVEs

Signed-off-by: Fred Rolland <frolland@nvidia.com>
 2025-04-06 16:31:47 +03:00
Doug Smith
55ef3b1f0b Merge pull request #1370 from thomasferrandiz/add-trivy 
Add trivy vulnerability scanner in build step
 2025-04-03 15:35:40 +02:00
Ben Pickard
41321963b8 Merge pull request #1374 from buroa/master 
fix: dockerfile change cmd to entrypoint
 2025-03-31 16:15:02 -04:00
Thomas Ferrandiz
ef8f01b299 Use cross-compilation for thick plugin build 2025-03-31 15:39:41 +00:00
Thomas Ferrandiz
51752f1a6e Add trivy vulnerability scanner in build step 
Signed-off-by: Thomas Ferrandiz <thomas.ferrandiz@suse.com>
 2025-03-31 15:39:41 +00:00
Ben Pickard
1821311479 Merge pull request #1412 from dougbtv/fix-empty-cni-result 
Properly structure empty CNI result
 2025-03-25 17:42:43 -04:00
dougbtv
ccfd8f5fea When returning an empty CNI result, it must be properly structured 
For a previous fix of returning an empty CNI result when pods are not found, the CNI result wasn't properly structured. This fixes the structuring.
 2025-03-25 14:45:04 -04:00
Doug Smith
2a91646eaf Merge pull request #1409 from maiqueb/bump-net-attach-def-client-lib-1.7.6 
build: consume net-attach-def-client lib 1.7.6
v4.2.0 		2025-03-24 19:22:12 +01:00
Ben Pickard
47e5153714 Merge pull request #1408 from dougbtv/pod-not-found-on-add 
handle pod not found during CNI ADD gracefully
 2025-03-24 14:11:03 -04:00
Miguel Duarte Barroso
21f7282088 build: consume net-attach-def-client lib 1.7.6 
This consumes the latest release of the network-attachment-definition-client
library which fixes a regression affecting CNI plugins that do not specify
interfaces in their CNI ADD result. This was fixed in [0].

[0] - https://github.com/k8snetworkplumbingwg/network-attachment-definition-client/pull/77

Signed-off-by: Miguel Duarte Barroso <mdbarroso@redhat.com>
 2025-03-24 15:51:11 +00:00
dougbtv
641f6a3b63 handle pod not found in CNI ADD gracefully 
sometimes pods get deleted super fast (like jobs or CI) and they come back as not found.

instead of erroring, just return an empty CNI result so things don't blow up.

adds a sentinel errPodNotFound and skips the rest of CmdAdd when we hit it.

shouts to race conditions.
 2025-03-24 09:58:38 -04:00
Ben Pickard
e156e815ad Merge pull request #1407 from dougbtv/pod-deleted-on-add 
Tolerate issues writing network status annotation on CNI ADD.
 2025-03-20 15:44:34 -04:00
dougbtv
5892d705da Tolerate issues writing network status annotation on CNI ADD. 
This change adds toleration for such errors like:

```
failed to [query/update] the pod pod-name-here in out of cluster comm: pod "pod-name-here" not found
```

During CNI ADD. While this change is a trade off in terms of debugability for RBAC, it's potentially noisy in scaled clusters when it is working properly.
 2025-03-20 14:20:00 -04:00
Ben Pickard
431a735eca Merge pull request #1404 from dougbtv/fix-e2e-dra 
The e2e kind config should use api/beta for the runtimeConfig
 2025-03-20 12:44:42 -04:00
dougbtv
99d72d14a3 The e2e kind config should use api/beta for the runtimeConfig 
Otherwise, the latest changes to DRA (which is beta in K8s 1.32) are incompatible.

Additionally, this:

* Bumps kind version to 0.27.0
* Changes `loglevel` flag to `v` verbosity flag for `kind export logs`
* fixes lint in the Dockerfile.
* adds a couple notes in the docs.
 2025-03-20 11:21:03 -04:00
Doug Smith
4a0b5073af Merge pull request #1273 from s1061123/cni110 
CNI 1.1.0 support
 2025-01-16 09:40:09 -05:00