CNI compatible libnetwork drivers #1978
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
abhi
force-pushed
the
cni
branch
3 times, most recently
from
e01e64e to
6cd0565
Compare
This commit contains the initial set of changes to add CNI sevice to libnetwork drivers. This is done using a cniserver which acts as a side car for libnetwork daemon to process CNI requests. Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
* Support HostAccess overlay option * Make HostMode configurable via overlay driver label * Disble SD and start in host-mode by default for CNI dnet * Moving the default dnet port from 2385 to 2389 * Fix hostAccess iptables rules * Implement JoinInfo and LeaveInfo interfaces on all builtin drivers * Enhance JoinInfo and LeaveInfo to allow ip allocation for gateway-ip * Make use of the RequestAddress feature for hostAccess overlay network * HostAccess network must also handle traffic from bridge to ! bridge. This is required for the ingress cases Signed-off-by: Madhu Venugopal <madhu@docker.com>
Signed-off-by: Abhinandan Prativadi <abhi@docker.com> Signed-off-by: Madhu Venugopal <madhu@docker.com>
This commit contains changes related to dynamically create networks depending on the CNI config and the current network state in libnetwork instance Signed-off-by: Abhinandan Prativadi <abhi@docker.com> CNI libnetwork files Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
* Make VXLAN and Gossip port configurable * Configurable Default gateway network name * Add DataDir configuration params Signed-off-by: Madhu Venugopal <madhu@docker.com>
This commit introduces configurable IPAM setting for cni configs. This would allow used to configure the network level ipam configs in the cni config Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
abhi
force-pushed
the
cni
branch
4 times, most recently
from
fe4d15e to
3358103
Compare
mavenugo
reviewed
Oct 12, 2017
| iptables \ | ||
| && rm -rf /var/lib/apt/lists/* | ||
|
|
||
| COPY bin/cniserver /var/libnetwork/bin/ |
There was a problem hiding this comment.
Shouldnt this be ../bin/ (this Dockerfile is in install directory
There was a problem hiding this comment.
Since its out of build context I have script to copy to the install. will rectify this later.
|
|
||
| COPY bin/cniserver /var/libnetwork/bin/ | ||
| COPY cniserver.sh /var/libnetwork/ | ||
| COPY bin/cnictl /var/libnetwork/bin/ |
| iptables \ | ||
| && rm -rf /var/lib/apt/lists/* | ||
|
|
||
| COPY bin/dnet /var/libnetwork/bin/ |
sandbox.go
Outdated
| @@ -619,6 +620,7 @@ func (sb *sandbox) resolveName(req string, networkName string, epList []*endpoin | |||
| } | |||
|
|
|||
| func (sb *sandbox) SetKey(basePath string) error { | |||
| fmt.Printf("SetKey: %s \n", basePath) | |||
abhi
force-pushed
the
cni
branch
8 times, most recently
from
8261c85 to
6ea2fb3
Compare
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
ijc
reviewed
Nov 1, 2017
| @@ -36,7 +36,8 @@ build-local: | |||
| @mkdir -p "bin" | |||
| go build -tags experimental -o "bin/dnet" ./cmd/dnet | |||
| go build -o "bin/docker-proxy" ./cmd/proxy | |||
|
|
|||
| go build -o "bin/cniserver" ./cmd/cni_server | |||
| go build -o "bin/cnictl" ./cmd/dnet_cni/ | |||
There was a problem hiding this comment.
I think this needs to be statically built since you don't control the environment it will end up running in -- it is run in the context of the runtime (so maybe cri or docker, perhaps in a container) and not in a container/env supplied by libnetwork.
|
What's current status? |
|
@abhi is your plan still to get this one merged? |
|
@olljanat @AkihiroSuda at this point this is put on hold. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an initial PR to make Libnetwork drivers such as bridge and overlay work as CNI plugins. A full detailed design doc will be submitted soon.