diff options
| author | Andrei Vagin <avagin@google.com> | 2019-05-02 19:33:19 -0700 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2019-05-02 19:34:36 -0700 |
| commit | 5f8225c009fcf297139c54c7b329da4aff679ece (patch) | |
| tree | 006fc95a57a43e29e8b820becafe49149912fc0e | |
| parent | c967fbdaa2cda260312f73a3f75744ac1ad11176 (diff) | |
runsc: don't create an empty network namespace if NetworkHost is set
With this change, we will be able to run runsc do in a host network namespace.
PiperOrigin-RevId: 246436660
Change-Id: I8ea18b1053c88fe2feed74239b915fe7a151ce34
| -rw-r--r-- | runsc/sandbox/sandbox.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/runsc/sandbox/sandbox.go b/runsc/sandbox/sandbox.go index 9d8cfa451..bc69a9d61 100644 --- a/runsc/sandbox/sandbox.go +++ b/runsc/sandbox/sandbox.go @@ -472,6 +472,8 @@ func (s *Sandbox) createSandboxProcess(spec *specs.Spec, conf *boot.Config, bund if ns, ok := specutils.GetNS(specs.NetworkNamespace, spec); ok && conf.Network != boot.NetworkNone { log.Infof("Sandbox will be started in the container's network namespace: %+v", ns) nss = append(nss, ns) + } else if conf.Network == boot.NetworkHost { + log.Infof("Sandbox will be started in the host network namespace") } else { log.Infof("Sandbox will be started in new network namespace") nss = append(nss, specs.LinuxNamespace{Type: specs.NetworkNamespace}) |