diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2018-07-19 14:29:00 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@gmail.com> | 2018-07-24 16:12:31 -0400 |
| commit | fc95f68247248e4cb029440e2fe4ba0b0df8049c (patch) | |
| tree | 1ecb382d8e9d8f512d7aea46129b3804b4d1983d /libpod/runtime_ctr.go | |
| parent | 3ae0c80806b68f712756fd660d06449e71eb41b7 (diff) | |
| download | podman-fc95f68247248e4cb029440e2fe4ba0b0df8049c.tar.gz podman-fc95f68247248e4cb029440e2fe4ba0b0df8049c.tar.bz2 podman-fc95f68247248e4cb029440e2fe4ba0b0df8049c.zip | |
Set namespace for new pods/containers based on runtime
New containers and pods will default to the namespace of the
runtime, but this can be overridden by With... options if
desired.
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
Diffstat (limited to 'libpod/runtime_ctr.go')
| -rw-r--r-- | libpod/runtime_ctr.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 82a2fed19..709775e4a 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -42,6 +42,12 @@ func (r *Runtime) NewContainer(ctx context.Context, rSpec *spec.Spec, options .. } ctr.config.StopTimeout = CtrRemoveTimeout + // Set namespace based on current runtime namespace + // Do so before options run so they can override it + if r.config.Namespace != "" { + ctr.config.Namespace = r.config.Namespace + } + for _, option := range options { if err := option(ctr); err != nil { return nil, errors.Wrapf(err, "error running container create option") |