github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-15 14:43:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6057 from stevenhorsman/CCv-no-netns

Browse Source 
runtime: fix up disable_netns handling
This commit is contained in:
Steve Horsman 2023-01-12 13:19:48 +00:00 committed by GitHub
commit d1993d2c90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/runtime/virtcontainers/sandbox.go
View File

@ -1260,11 +1260,11 @@ func (s *Sandbox) startVM(ctx context.Context, prestartHookFunc func(context.Con
}
}
// In case of vm factory, network interfaces are hotplugged
// after vm is started.
// In case of prestartHookFunc, network config might have been changed.
// We need to rescan and handle the change.
if s.factory != nil || prestartHookFunc != nil {
// 1. Do not scan the netns if we want no network for the vmm.
// 2. In case of vm factory, scan the netns to hotplug interfaces after vm is started.
// 3. In case of prestartHookFunc, network config might have been changed. We need to
// rescan and handle the change.
if !s.config.NetworkConfig.DisableNewNetwork && (s.factory != nil || prestartHookFunc != nil) {
if _, err := s.network.AddEndpoints(ctx, s, nil, true); err != nil {
return err
}