Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add CNI config 1.0.0 support. #101

Merged
merged 2 commits into from
Dec 25, 2023
Merged

Conversation

aznashwan
Copy link
Contributor

This PR updates the containernetwork/cni dependency to 1.1.2 and adds support for reading CNI configs of up to 1.0.0.

Note that, although the "CHECK" verb had an entry point added for it it, it is currently no-op.

Note that this is only a dependency update which does
NOT enable reading CNI configs > 0.3.0.

Signed-off-by: Nashwan Azhari <[email protected]>
@aznashwan
Copy link
Contributor Author

I am unsure why the 2022 runner is failing to find the main interface, as I have managed to successfully run it 5 times on my fork. (104, 105, 106, 107, and 108)

@debj1t could you please re-run the CI a couple more times so we can see whether it's an issue on this repo or transient to the runners.

common/core/network.go Show resolved Hide resolved
cni/cni.go Outdated Show resolved Hide resolved
Copy link
Contributor

@debj1t debj1t left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, for all the work!

@debj1t debj1t merged commit 2137a67 into microsoft:master Dec 25, 2023
3 checks passed
@nicolaerosia
Copy link

@debj1t is there a way I can test this out? I would like to get an archive with the artefacts

@aznashwan
Copy link
Contributor Author

@nicolaerosia back in December I had written this workflow running containerd's integration tests against the plugins.

Looking at one of my latest runs, the nat tests all ran fine and the sdnbridge ones were only failing at the PortMapping tests. (by default, the sdnbridge plugin does NOT create a gateway endpoint to allow the containers to reach the host)
sdnoverlay was blocked at initial network creation, however.

NOTE: there is a slight issue with the naming of the plugins not coinciding with the HNS network types, so you will need to also include this other PR in your testing. (it was the final blocker which prevented full integration with containerd before I left the project)

Hope this helped a bit, godspeed!

@slonopotamus
Copy link

slonopotamus commented Jul 11, 2024

Could you please make a release with these changes? It is required for nerdctl, see containerd/nerdctl#28 (comment)

slonopotamus added a commit to slonopotamus/stevedore that referenced this pull request Jul 12, 2024
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