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 CNI dependencies to v1.0.0 #9

Merged
merged 1 commit into from
Oct 22, 2021
Merged

Conversation

darkowlzz
Copy link
Contributor

@darkowlzz darkowlzz commented Aug 26, 2021

Updates CNI dependencies to v1.0.0.

IPConfig in v1.0.0 removes the Version field, refer containernetworking/cni#783.

Add CNI version 0.4.0 to the supported plugin versions along with the
current version, 1.0.0.

In an attempt to update the CNI dependencies in firecracker-go-sdk, I created firecracker-microvm/firecracker-go-sdk#351, but since fc-go-sdk depends on this repo, I updated the same here. Hope that's not a problem.

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

`IPConfig` in v1.0.0 removes the `Version` field.

Add CNI version 0.4.0 to supported plugin versions along with the
current version, 1.0.0.

Signed-off-by: Sunny <darkowlzz@protonmail.com>
@@ -3,11 +3,11 @@ module github.com/awslabs/tc-redirect-tap
go 1.11

require (
github.com/containernetworking/cni v0.7.1
github.com/containernetworking/plugins v0.8.6
github.com/containernetworking/cni v1.0.0
Copy link
Contributor

Choose a reason for hiding this comment

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

This needs to be 1.0.1

github.com/containernetworking/cni v0.7.1
github.com/containernetworking/plugins v0.8.6
github.com/containernetworking/cni v1.0.0
github.com/containernetworking/plugins v1.0.0
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here

"github.com/awslabs/tc-redirect-tap/internal"
)

func main() {
skel.PluginMain(add, check, del,
// support CNI versions that support plugin chaining
version.PluginSupports("0.3.0", "0.3.1", version.Current()),
version.PluginSupports("0.3.0", "0.3.1", "0.4.0", version.Current()),
Copy link
Contributor

Choose a reason for hiding this comment

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

This needs "1.0.0" added, which is the stable spec.

@gaby
Copy link
Contributor

gaby commented Oct 22, 2021

@kzys @xibz Could any of you review this? Thanks!

@kzys
Copy link
Contributor

kzys commented Oct 22, 2021

LGTM! Thanks.

@kzys kzys merged commit ccb32b9 into awslabs:master Oct 22, 2021
@gaby
Copy link
Contributor

gaby commented Oct 22, 2021

@kzys The PR was not ready for merge yet, the working version should be 1.0.1

In the 1.0.0 they forgot to add the 1.0.0 spec.

I will send another PR in like 1-2 hours.

@gaby
Copy link
Contributor

gaby commented Oct 23, 2021

Submitted #10 to fix the update to v1.0.1

@darkowlzz darkowlzz deleted the cni-100 branch October 23, 2021 20:04
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