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

Bump containernetworking dependencies only #916

Merged
merged 1 commit into from
Apr 20, 2020

Conversation

mogren
Copy link
Contributor

@mogren mogren commented Apr 17, 2020

Description of changes:

  • Bump of containernetworking dependencies
  • The ns package has moved to the plugins package.
  • Bumped portmap version

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@mogren mogren force-pushed the update-containernetworking branch from 3d0cbfc to a499272 Compare April 17, 2020 21:47
},
)
delIPCnt = prometheus.NewCounterVec(
prometheus.CounterOpts{
Name: "awscni_del_ip_req_count",
Help: "The number of delete IP address request",
Help: "The number of delete IP address requests",

Choose a reason for hiding this comment

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

Is this change primarily for readability ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, sentence was not correct.

@@ -13,7 +13,7 @@

package cninswrapper

import "github.com/containernetworking/cni/pkg/ns"
import "github.com/containernetworking/plugins/pkg/ns"

Choose a reason for hiding this comment

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

Have all these packages moved under plugins directory now ? Looking at this PR in isolation is not giving me that insight. Can we still continue to use cni directory packages ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The upstream package was moved in v0.6.0 back in August 2017, so we have to import the files from where they are now.

Choose a reason for hiding this comment

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

Thanks for clarification. Lets run integration changes post this at least once again before the release.

@mogren mogren requested a review from abhipth April 19, 2020 23:20
Copy link

@astrived astrived left a comment

Choose a reason for hiding this comment

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

Lets wait for others to bless this change.

Copy link
Contributor

@jaypipes jaypipes left a comment

Choose a reason for hiding this comment

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

Good work Mogrenator!

@@ -15,7 +16,7 @@ require (
github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect
github.com/googleapis/gnostic v0.2.0 // indirect
github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc // indirect
github.com/hashicorp/golang-lru v0.0.0-20180201235237-0fb14efe8c47 // indirect
Copy link
Contributor

Choose a reason for hiding this comment

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

\o/ always good to get rid of older non-semver deps.

@jaypipes jaypipes merged commit 5ea64a5 into aws:master Apr 20, 2020
mogren pushed a commit to mogren/amazon-vpc-cni-k8s that referenced this pull request Apr 20, 2020
mogren pushed a commit that referenced this pull request Apr 20, 2020
@mogren mogren deleted the update-containernetworking branch September 4, 2020 05:56
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