Add support for multiple pod networks #12

dcbw · 2018-01-11T21:10:58Z

PodNetwork has a new member "Networks" which takes an array of
strings. These map to CNI configuration network names (the "name"
field of CNI config JSON).

If Networks is left empty, then the previous behavior of using
the first found config in /etc/cni/net.d still happens.

Signed-off-by: Dan Williams [email protected]

@mrunalp @rajatchopra what do you guys think?

rajatchopra

Looks fine to me, except one comment above. I will give it another pass tomorrow.

Did we want to expose any other functions meanwhile? Like GetNetwork? so that the library can be used for other purposes?

rajatchopra · 2018-01-12T00:36:06Z

pkg/ocicni/ocicni.go

+
 		// Search for vendor-specific plugins as well as default plugins in the CNI codebase.
-		vendorDir := vendorCNIDir(vendorCNIDirPrefix, confList.Plugins[0].Network.Type)
+		vendorDir := vendorCNIDir(plugin.vendorCNIDirPrefix, confList.Plugins[0].Network.Type)


Could we flatten Plugins and all the Plugin.Network.Type in the Path? Plugins[0] will still leave it selective.

Could we flatten Plugins and all the Plugin.Network.Type in the Path? Plugins[0] will still leave it selective.

@rajatchopra done

dcbw · 2018-01-12T16:06:54Z

Did we want to expose any other functions meanwhile? Like GetNetwork? so that the library can be used for other purposes?

Maybe let's see if anyone asks for it before we do?

dcbw · 2018-06-08T21:10:57Z

Holding off on proposing this for merge until CNI containernetworking/cni#558 lands.

dcbw · 2018-06-20T15:25:13Z

@baude @mheon @rajatchopra @cri-o/ocicni-maintainers PTAL thanks!

rhatdan · 2018-06-20T18:19:23Z

Thought this was under CRI-O...

Signed-off-by: Dan Williams <[email protected]>

mrunalp · 2018-07-11T18:19:44Z

@dcbw Can your rebase?

07c1a6da47b7fbf8b357f4949ecce2113e598491 (0.7.0-alpha1)

Ginkgo: 7f8ab55aaf3b86885aa55b762e803744d1674700 (v1.2.0-29-g7f8ab55) Gomega: 2152b45fa28a361beba9aab0885972323a444e28 (v1.0-71-g2152b45)

PodNetwork has a new member "Networks" which takes an array of strings. These map to CNI configuration network names (the "name" field of CNI config JSON). If Networks is left empty, then the previous behavior of using the first found config in /etc/cni/net.d still happens. Signed-off-by: Dan Williams <[email protected]>

dcbw · 2018-07-12T03:47:09Z

@mrunalp done, new commit added (missing default network...)

rhatdan · 2018-07-12T12:47:18Z

@dcbw Tests think you need to gofmt your code.

We should only look in a single directory for config files, but allow the user to specify multiple binary directories (like vendor-specific ones) in which to look for plugin binaries. Parly ports of Kubernetes changes: 69ac723b78464b9474f9c069bbfd3dbbdbd19239 cni: convert "vendor" option to multiple plugin binary search paths 16eaaaed836ed66fac76f8624d528bc8cd4426bb cni: clarify bin/conf directory variable names And partly cleanups of the watcher/monitor code to enable better testing.

It doesn't really need anything from 'plugin' so we might as well make it more testable.

syncNetworkConfig() would fail to populate the network list if the default network was not found, which prevents containers that want non-default networks from being networked.

dcbw · 2018-07-12T14:13:54Z

@rhatdan @mrunalp done

rhatdan · 2018-07-12T15:05:26Z

LGTM

mrunalp · 2018-07-12T15:06:17Z

LGTM

runcom · 2019-01-29T12:35:14Z

vendoring this in crio produces the following:

go build -i -ldflags '-s -w -X main.gitCommit="47ede695dffc2abd2e7bbf5e4f68ccb78a17fae5-dirty" -X main.buildInfo=1548764930' -tags "     seccomp selinux  containers_image_ostree_stub" -o bin/crio github.com/kubernetes-sigs/cri-o/cmd/crio
# github.com/kubernetes-sigs/cri-o/server
server/sandbox_network.go:29:14: cannot assign []"github.com/kubernetes-sigs/cri-o/vendor/github.com/containernetworking/cni/pkg/types".Result to result (type "github.com/kubernetes-sigs/cri-o/vendor/github.com/containernetworking/cni/pkg/types".Result) in multiple assignment:
	[]"github.com/kubernetes-sigs/cri-o/vendor/github.com/containernetworking/cni/pkg/types".Result does not implement "github.com/kubernetes-sigs/cri-o/vendor/github.com/containernetworking/cni/pkg/types".Result (missing GetAsVersion method)
server/sandbox_network.go:36:13: cannot assign []"github.com/kubernetes-sigs/cri-o/vendor/github.com/containernetworking/cni/pkg/types".Result to podIP (type string) in multiple assignment
server/sandbox_network.go:76:2: cannot use ip (type []"github.com/kubernetes-sigs/cri-o/vendor/github.com/containernetworking/cni/pkg/types".Result) as type string in return argument
make: *** [Makefile:105: bin/crio] Error 2

@dcbw could you help me out? 👼

dcbw force-pushed the multi-network branch from 65edbdb to 8ec876a Compare January 11, 2018 21:11

rajatchopra reviewed Jan 12, 2018

View reviewed changes

dcbw force-pushed the multi-network branch from 8ec876a to 6b52c4e Compare January 12, 2018 16:05

dcbw force-pushed the multi-network branch 15 times, most recently from dc8311c to 6f12daf Compare June 8, 2018 21:02

dcbw changed the title ~~Add support for multiple pod networks~~ [do not merge] Add support for multiple pod networks Jun 8, 2018

dcbw force-pushed the multi-network branch from 6f12daf to e823ee6 Compare June 13, 2018 15:53

dcbw changed the title ~~[do not merge] Add support for multiple pod networks~~ Add support for multiple pod networks Jun 13, 2018

mheon mentioned this pull request Jun 20, 2018

Port binding not working containers/podman#661

Closed

dcbw requested review from mrunalp and runcom June 20, 2018 19:04

dcbw added a commit to dcbw/libpod that referenced this pull request Jun 20, 2018

vendor: update ocicni to cri-o/ocicni#12

77b126e

Signed-off-by: Dan Williams <[email protected]>

dcbw mentioned this pull request Jul 11, 2018

sdn: don't blow away all existing CNI plugins openshift/openshift-ansible#7825

Merged

dcbw added 4 commits July 11, 2018 22:37

vendor: update containernetworking/cni

7eafd72

07c1a6da47b7fbf8b357f4949ecce2113e598491 (0.7.0-alpha1)

vendor: add ginkgo & gomega

1deda23

Ginkgo: 7f8ab55aaf3b86885aa55b762e803744d1674700 (v1.2.0-29-g7f8ab55) Gomega: 2152b45fa28a361beba9aab0885972323a444e28 (v1.0-71-g2152b45)

build: add 'make check' functionality

49aa96d

dcbw force-pushed the multi-network branch from e823ee6 to 1b8bf4e Compare July 12, 2018 03:46

dcbw added 4 commits July 12, 2018 09:06

ocicni: small cleanup for loadNetworks()

e0ac43f

It doesn't really need anything from 'plugin' so we might as well make it more testable.

ocicni: add testcases

0d6eb34

ocicni: missing default network is not a hard error

2d3ce46

syncNetworkConfig() would fail to populate the network list if the default network was not found, which prevents containers that want non-default networks from being networked.

dcbw force-pushed the multi-network branch from 1b8bf4e to 2d3ce46 Compare July 12, 2018 14:07

mrunalp merged commit 0df475a into cri-o:master Jul 12, 2018

runcom mentioned this pull request Jan 29, 2019

[WIP] Sync vendor and add validation cri-o/cri-o#2041

Closed

4 tasks

Add support for multiple pod networks #12

Add support for multiple pod networks #12

Uh oh!

Conversation

dcbw commented Jan 11, 2018

Uh oh!

rajatchopra left a comment

Choose a reason for hiding this comment

Uh oh!

rajatchopra Jan 12, 2018

Choose a reason for hiding this comment

Uh oh!

dcbw Jan 12, 2018

Choose a reason for hiding this comment

Uh oh!

dcbw commented Jan 12, 2018

Uh oh!

dcbw commented Jun 8, 2018

Uh oh!

dcbw commented Jun 20, 2018

Uh oh!

rhatdan commented Jun 20, 2018

Uh oh!

mrunalp commented Jul 11, 2018

Uh oh!

dcbw commented Jul 12, 2018

Uh oh!

rhatdan commented Jul 12, 2018

Uh oh!

dcbw commented Jul 12, 2018

Uh oh!

rhatdan commented Jul 12, 2018

Uh oh!

mrunalp commented Jul 12, 2018

Uh oh!

runcom commented Jan 29, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants