Skip to content
This repository has been archived by the owner on Feb 24, 2020. It is now read-only.

networking: bump to CNI v0.3.0, and adapt & refactor code #2696

Merged
merged 9 commits into from
May 27, 2016
Merged

networking: bump to CNI v0.3.0, and adapt & refactor code #2696

merged 9 commits into from
May 27, 2016

Conversation

steveej
Copy link
Contributor

@steveej steveej commented May 25, 2016

TODO

@@ -406,6 +426,11 @@
"Rev": "a1b8ba5163b7f041b22761461eabd02b70d1f824"
},
{
"ImportPath": "github.com/gogo/protobuf/proto",
"Comment": "v0.1-125-g82d16f7",
"Rev": "82d16f734d6d871204a3feb1a73cb220cc92574c"
Copy link
Member

Choose a reason for hiding this comment

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

I don't know if gogo/protobuf#182 would be done in time.

Does it actually fail with the old tag v0.2?
#2673 (comment)

if err != nil {
return nil, err
func podNSerrorOK(podNSPath string, err error) bool {

Copy link
Member

Choose a reason for hiding this comment

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

why empty lines

@jellonek
Copy link
Contributor

Additionally intelsdi-x@706e8b2 provides changes included in containernetworking/cni#149 to kvm flavor.

I'll look on this deeper on Monday, but it seems that this PR breaks kvm network teardown. tap interfaces and iptables rules are preserved after gc.

@steveej
Copy link
Contributor Author

steveej commented May 27, 2016

@jellonek can you point us to a direction why the teardown wouldn't work for KVM? I changed the handling of netns creation and switching, but I thought KVM doesn't involve that.

@steveej
Copy link
Contributor Author

steveej commented May 27, 2016

@jellonek also, It seems to be likely that the disabled/failing tests are dependent on the cleanup of these interfaces. can you confirm that?

@@ -215,12 +200,20 @@ func Load(podRoot string, podID *types.UUID) (*Networking, error) {
nets = append(nets, *n)
}

// TODO load podNS
Copy link
Member

Choose a reason for hiding this comment

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

remove?

@iaguis
Copy link
Member

iaguis commented May 27, 2016

LGTM

steveej added 3 commits May 27, 2016 16:57
* Fixes KVM flavor, which doesn't use the NS file
This will implicitly disable these tests for the KVM flavor on which
they are currently failing.
@@ -1,4 +1,5 @@
#!/bin/bash -e
#!/usr/bin/env bash
Copy link
Member

Choose a reason for hiding this comment

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

:nixos:

Copy link
Contributor

Choose a reason for hiding this comment

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

embarrassing

@jellonek
Copy link
Contributor

@steveej: i'll try to confirm that on monday.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants