diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-29 15:34:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-29 15:34:37 +0000 |
| commit | 63f0bb93f8b51945e37ad04e977d57942f4dd148 (patch) | |
| tree | 621c068638bb457f3695407b77bfb5ce7de4f0e5 /pkg/specgen/generate | |
| parent | 53aa9764c48783814710919f1b78185cd13db35c (diff) | |
| parent | b6176d8987a0049a253fd7a70b2cd8e17bd50b53 (diff) | |
| download | podman-63f0bb93f8b51945e37ad04e977d57942f4dd148.tar.gz podman-63f0bb93f8b51945e37ad04e977d57942f4dd148.tar.bz2 podman-63f0bb93f8b51945e37ad04e977d57942f4dd148.zip | |
Merge pull request #7783 from ashley-cui/slirp
Add support for slirp network for pods
Diffstat (limited to 'pkg/specgen/generate')
| -rw-r--r-- | pkg/specgen/generate/pod_create.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/specgen/generate/pod_create.go b/pkg/specgen/generate/pod_create.go index 101201252..43caf0fe9 100644 --- a/pkg/specgen/generate/pod_create.go +++ b/pkg/specgen/generate/pod_create.go @@ -99,6 +99,9 @@ func createPodOptions(p *specgen.PodSpecGenerator, rt *libpod.Runtime) ([]libpod case specgen.Host: logrus.Debugf("Pod will use host networking") options = append(options, libpod.WithPodHostNetwork()) + case specgen.Slirp: + logrus.Debugf("Pod will use slirp4netns") + options = append(options, libpod.WithPodSlirp4netns(p.NetworkOptions)) default: return nil, errors.Errorf("pods presently do not support network mode %s", p.NetNS.NSMode) } |