This repository has been archived by the owner on Dec 7, 2023. It is now read-only.
Improve the CNI implementation, and documentation #308
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
luxas
changed the title
luxas
added
the
kind/enhancement
twelho
approved these changes
Aug 9, 2019
| **Cons:** | ||
|
|
||
| - **docker-dependent**: By design, this mode is can only be used with docker, and is hence not portable across container runtimes. | ||
| - **No multi-node support**: The IP is local (in the `172.17.0.0/16` range), and hence other computers can't connect to your VM's IP address. |
There was a problem hiding this comment.
This IP range differs from the one given above, I believe this one here (172.17.0.0/16) is correct and the one above should be changed.
pkg/network/docker/docker.go
Outdated
| } | ||
|
|
||
| func GetDockerNetworkPlugin(r runtime.Interface) (network.Plugin, error) { | ||
| return &dockerNetworkPlugin{r}, nil |
There was a problem hiding this comment.
Does this need to return an error?
| IP: result.IPAddress, | ||
| Mask: net.IPv4Mask(255, 255, 0, 0), | ||
| }, | ||
| Gateway: net.IPv4(result.IPAddress[0], result.IPAddress[1], result.IPAddress[2], 1), |
There was a problem hiding this comment.
Add TODO to make this configurable/auto-retrievable if someone has changed their gateway?
pkg/network/cni/cni.go
Outdated
| @@ -162,22 +163,46 @@ func (plugin *cniNetworkPlugin) Status() error { | |||
| return plugin.checkInitialized() | |||
| } | |||
|
|
|||
| func (plugin *cniNetworkPlugin) SetupContainerNetwork(containerid string) error { | |||
| func (plugin *cniNetworkPlugin) PrepareContainerSpec(container *runtime.ContainerConfig) error { | |||
| // we will handle the networking on our own | |||
pkg/operations/start.go
Outdated
| } | ||
|
|
||
| log.Infof("Networking is handled by %s", networkPlugin.Name()) |
pkg/providers/docker/runtime.go
Outdated
| func SetDockerNetwork() error { | ||
| log.Trace("Initializing the Docker network provider...") | ||
| plugin, err := network.GetDockerNetworkPlugin(providers.Runtime) | ||
| if err != nil { |
There was a problem hiding this comment.
This error is unnecessary, it's always nil
pkg/providers/providers.go
Outdated
| @@ -22,6 +22,10 @@ var Storage storage.Storage | |||
|
|
|||
| type ProviderInitFunc func() error | |||
|
|
|||
| func init() { | |||
| NetworkPlugins = make(map[string]network.Plugin) | |||
There was a problem hiding this comment.
This can be an inline initialization: var NetworkPlugins = make(map[string]network.Plugin), no need for init()
|
Comments addressed, and the CI is green, merging 👍 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes: #171
Fixes: #303
This PR:
cc @twelho