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

CNI v0.5.2 #3668

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

CNI v0.5.2 #3668

wants to merge 2 commits into from

Conversation

squeed
Copy link
Contributor

@squeed squeed commented Apr 28, 2017

WIP support for ConfigLists and multiple IPs

TODO: fix kvm flannel nastiness.

@ghost
Copy link

ghost commented Apr 28, 2017

Can one of the admins verify this patch?

@lucab
Copy link
Member

lucab commented May 2, 2017

Forgot to gofmt this?

This adds support for ConfigLists and multiple IPs returned
@adsri
Copy link

adsri commented Jul 26, 2017

Can you please tell when this patch is going to merge and if this PR will be merged with 1.29.0 when this is going to be released.

)

// GetNetworkDescriptions converts activeNets to netDescribers
func GetNetworkDescriptions(n *networking.Networking) []NetDescriber {
/*func GetNetworkDescriptions(n *networking.Networking) []NetDescriber {
Copy link
Contributor

Choose a reason for hiding this comment

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

Commented code leaved in patch.

@@ -21,7 +21,7 @@ import (
"path/filepath"
"syscall"

"github.com/containernetworking/cni/pkg/types"
cniv031 "github.com/containernetworking/cni/pkg/types/current"
Copy link
Contributor

Choose a reason for hiding this comment

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

Please name it cnitypes (in future it can contain other version than 0.3.1).

return nil, err
}
} else {
return nil, fmt.Errorf("don't understand cni file %s", filepath)
Copy link
Contributor

Choose a reason for hiding this comment

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

Please use: "unknown type of cni config file %s"

@lucab
Copy link
Member

lucab commented Jul 26, 2017

@adsri this patch is going to be merged after tests are green and review is sucessfully finished. It is milestoned to 1.29.0, so that's the intention. There isn't yet any final schedule for that release (as 1.28 is still pending), but it should be tentatively sometime around end of August.

adsri added a commit to adsri/cni-infoblox that referenced this pull request Jul 27, 2017
The above changes is verified with openshift and kubernetes cluster
with docker containers.

rkt do not support CNI spec 0.3.1, it will support from rkt release
1.29.0 as per pull request: rkt/rkt#3668
which is expected to be merged in august end.
@lucab lucab modified the milestones: 1.29.0, 1.30.0 Sep 21, 2017
@elij
Copy link

elij commented Dec 5, 2017

is there anything external people could do to help get this merge over the line?

@iaguis iaguis modified the milestones: 1.30.0, v1.31.0 Apr 11, 2018
@arizvisa
Copy link

arizvisa commented Feb 5, 2019

@squeed, do you want someone else to take over maintaining this PR to get it merged?

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.

None yet

7 participants