diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-05-26 23:13:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-26 23:13:40 +0200 |
| commit | d9eb1269257490dddfae3fde2fe57c3009f94287 (patch) | |
| tree | 2a05ee02a825f2024fa7151b2514f66cafe330e4 /pkg/specgen/generate/namespaces.go | |
| parent | 5b4ffc7ba79d0c3ad59cce17500c5a98ea686577 (diff) | |
| parent | 533d88b6566974c979932bab071e9408580ac7f8 (diff) | |
| download | podman-d9eb1269257490dddfae3fde2fe57c3009f94287.tar.gz podman-d9eb1269257490dddfae3fde2fe57c3009f94287.tar.bz2 podman-d9eb1269257490dddfae3fde2fe57c3009f94287.zip | |
Merge pull request #10447 from mheon/rootlesscni_default
Add the option of Rootless CNI networking by default
Diffstat (limited to 'pkg/specgen/generate/namespaces.go')
| -rw-r--r-- | pkg/specgen/generate/namespaces.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/specgen/generate/namespaces.go b/pkg/specgen/generate/namespaces.go index 278f35c22..f41186ae4 100644 --- a/pkg/specgen/generate/namespaces.go +++ b/pkg/specgen/generate/namespaces.go @@ -66,7 +66,7 @@ func GetDefaultNamespaceMode(nsType string, cfg *config.Config, pod *libpod.Pod) case "cgroup": return specgen.ParseCgroupNamespace(cfg.Containers.CgroupNS) case "net": - ns, _, err := specgen.ParseNetworkNamespace(cfg.Containers.NetNS) + ns, _, err := specgen.ParseNetworkNamespace(cfg.Containers.NetNS, cfg.Containers.RootlessNetworking == "cni") return ns, err } |