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.

Sign up for GitHub

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

Jump to bottom

Upgrade CNI to 0.6.0 in netplugin #1100

Merged
merged 3 commits into from
Dec 21, 2017
Merged

Upgrade CNI to 0.6.0 in netplugin #1100

merged 3 commits into from
Dec 21, 2017

Conversation

vhosakot
Copy link
Member

@vhosakot vhosakot commented Dec 11, 2017 •
edited
Loading

This PR upgrades CNI to 0.6.0 in netplugin. It has the following changes:

  1. Update ImportPath, version and Rev (git commit SHA) in Godeps.json for CNI 0.6.0.
  2. Update CNI version to 0.6.0 in the following k8s YAML files:
  install/k8s/contiv/contiv.yaml
  install/k8s/contiv/contiv_aci.yaml
  install/k8s/contiv/contiv_devtest.yaml
  1. Replace legacy import path appc/cni with the correct import path containernetworking/cni in k8s_cni.go and update required code to handle IPv4 and IPv6 addresses with CNI 0.6.0.
  2. Removed legacy vendor dir netplugin/vendor/github.com/appc.
  3. Added new vendor dir netplugin/vendor/github.com/containernetworking/cni needed for CNI 0.6.0.

Signed-off-by: Vikram Hosakote [email protected]

@vhosakot
Upgrade CNI to 0.6.0 in netplugin
9fdfdb0 
Signed-off-by: Vikram Hosakote <[email protected]>
@vhosakot
Copy link
Member Author

build PR

This was referenced Dec 11, 2017
Open
Open
@vhosakot
Copy link
Member Author

build PR

@vhosakot
Fixed vendor paths
cde9fea 
Signed-off-by: Vikram Hosakote <[email protected]>
@vhosakot
Copy link
Member Author

build PR

@vhosakot
Copy link
Member Author

Green gate with CNI 0.6.0!

amccormi
amccormi approved these changes Dec 12, 2017
View reviewed changes
Copy link

@amccormi amccormi left a comment

Choose a reason for hiding this comment

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

Looks good to me

@vhosakot
Copy link
Member Author

Since contiv 1.2 is released, this can be merged now.

@dojacobs
Copy link
Contributor

build pr

@dojacobs
Copy link
Contributor

build PR

4 similar comments
@dojacobs
Copy link
Contributor

build PR

@vhosakot
Copy link
Member Author

build PR

@vhosakot
Copy link
Member Author

build PR

@vhosakot
Copy link
Member Author

build PR

@vhosakot
Copy link
Member Author

Green gate ready for merge.

@chrisplo chrisplo merged commit 80a1998 into contiv:master Dec 21, 2017
@vhosakot vhosakot deleted the netplugin_cni_upgrade branch December 21, 2017 19:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dseevr dseevr dseevr approved these changes

@amccormi amccormi amccormi approved these changes

Assignees
No one assigned
Labels
squash when merging
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@vhosakot @dojacobs @dseevr @amccormi @chrisplo