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

feat: upgrade dependencies; CNI 1.1.0 support #1371

Closed
wants to merge 1 commit into from

Conversation

buroa
Copy link

@buroa buroa commented Dec 18, 2024

This PR support CNI SPEC 1.1.0, with new CNI commands, GC and STATUS [on top of stale 1273]

I have also upgraded all vendor dependencies.

This is now required to work with containerd v2.0.1+

More info here: containerd/go-cni#123

Signed-off-by: Steven Kreitzer <skre@skre.me>
@buroa buroa marked this pull request as ready for review December 18, 2024 19:03
@buroa
Copy link
Author

buroa commented Dec 18, 2024

Hey @s1061123 and @dougbtv, sorry, this is a pretty big PR due to upgrading vendor dependencies. I'm also not sure if this function is correct: https://github.com/buroa/multus-cni/blob/master/pkg/kubeletclient/kubeletclient.go#L159

@dougbtv
Copy link
Member

dougbtv commented Dec 19, 2024

mind breaking out the go.mod changes from the vendoring? thanks!

@buroa
Copy link
Author

buroa commented Dec 19, 2024

@dougbtv Do you mean to not include any vendoring/dependency/go.mod updates?

@s1061123
Copy link
Member

s1061123 commented Dec 20, 2024

Hi,

Thank you so much for your contribution, @buroa .

Minor (but important) comments

  • The PR code looks same to mine. Is there any difference? Just update vendoring? I'm not quite sure that why you file another PR. If you rewrite everything and then push this PR, it is okey. If you copy it from mine, the commit log is completely changed. Copywrite is important, of course. In addition, we expect that you will take care CNI1.1 related issue because YOU are author of CNI1.1 support code.
  • In addition, e2e tests are failed. Could you please take a look into it?

@buroa buroa closed this Dec 29, 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.

3 participants