CNI v0.5.2 #3668
base: master
Are you sure you want to change the base?
CNI v0.5.2 #3668
Conversation
Can one of the admins verify this patch? |
Forgot to gofmt this? |
This adds support for ConfigLists and multiple IPs returned
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 { |
There was a problem hiding this comment.
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" |
There was a problem hiding this comment.
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) |
There was a problem hiding this comment.
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"
@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. |
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.
is there anything external people could do to help get this merge over the line? |
@squeed, do you want someone else to take over maintaining this PR to get it merged? |
WIP support for ConfigLists and multiple IPs
TODO: fix kvm flannel nastiness.