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

Update to CNI & Plugins 1.0.1 with stable 1.0 spec #337

Merged
merged 1 commit into from
Sep 28, 2021

Conversation

dtrudg
Copy link
Member

@dtrudg dtrudg commented Sep 27, 2021

Description of the Pull Request (PR):

Update to CNI & Plugins 1.0.1 with stable 1.0 spec

The flannel plugin is now part of a different repository, so is not
built as part of a singularityce install.

Plugins sbr and vrf that were previously not built, but are part
of plugins v1.0.1, have been added to the build.

This fixes or addresses the following GitHub issues:

Before submitting a PR, make sure you have done the following:

@dtrudg dtrudg added the dependencies Pull requests that update a dependency file label Sep 27, 2021
@dtrudg dtrudg added this to the SingularityCE 3.9.0 milestone Sep 27, 2021
@dtrudg dtrudg self-assigned this Sep 27, 2021
@dtrudg dtrudg force-pushed the cni101 branch 5 times, most recently from 68be87f to 8f938cd Compare September 27, 2021 19:45
@dtrudg
Copy link
Member Author

dtrudg commented Sep 27, 2021

Test is failing.

The assumption for CNI_ARGS passed to plugins is that a plugin that consumes any arg must consume all args, or it's an error. (containernetworking/cni#560).

Before updating to 1.0.1 the bridge plugin consumed no args, so the fact that we were passing IP= didn't matter. As the bridge plugin now consumes a CNI_ARG (containernetworking/plugins#636) we now get an error because it doesn't consume IP=

Exact situation predicted in containernetworking/cni#560....

In addition, not only in chained case, similar case could be happen when both IPAM and interface CNI (e.g. bridge) consume CNI_ARGS in the future, hence I suppose we could just remove the check.

The `flannel` plugin is now part of a different repository, so is not
built as part of a singularityce install.

Plugins `sbr` and `vrf` that were previously not built, but are part
of plugins v1.0.1, have been added to the build.

Fixes sylabs#336
@dtrudg
Copy link
Member Author

dtrudg commented Sep 28, 2021

Forgot to update the example config version to 1.0.0... now done.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update CNI plugins to v1.0.1
2 participants