github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-04 11:06:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #682 from bergwolf/fix-nic

Browse Source 
network: always assign sandbox networkNS
This commit is contained in:
Archana Shinde 2018-09-04 10:32:02 -07:00 committed by GitHub
commit 3594a79c49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
virtcontainers/default_network.go
View File

@ -54,11 +54,7 @@ func (n *defNetwork) add(s *Sandbox) error {
return err
}
s.networkNS = NetworkNamespace{
NetNsPath: s.config.NetworkConfig.NetNSPath,
NetNsCreated: s.config.NetworkConfig.NetNsCreated,
Endpoints: endpoints,
}
s.networkNS.Endpoints = endpoints
err = doNetNS(s.config.NetworkConfig.NetNSPath, func(_ ns.NetNS) error {
for _, endpoint := range s.networkNS.Endpoints {

19
virtcontainers/sandbox.go
View File

@ -973,19 +973,22 @@ func (s *Sandbox) createNetwork() error {
span, _ := s.trace("createNetwork")
defer span.Finish()
s.networkNS = NetworkNamespace{
NetNsPath: s.config.NetworkConfig.NetNSPath,
NetNsCreated: s.config.NetworkConfig.NetNsCreated,
}
// In case there is a factory, the network should be handled
// through some calls at the API level, in order to add or
// remove interfaces and routes.
// This prevents from any assumptions that could be made from
// virtcontainers, in particular that the VM has not been started
// before it starts to scan the current network.
if s.factory != nil {
return nil
}
// Add the network
if err := s.network.add(s); err != nil {
return err
if s.factory == nil {
// Add the network
if err := s.network.add(s); err != nil {
return err
}
}
// Store the network
@ -1117,8 +1120,6 @@ func (s *Sandbox) startVM() error {
if err != nil {
return err
}
// FIXME: factory vm needs network hotplug to add Nics.
s.networkNS.NetNsPath = ""
return nil
}