diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-11-10 19:10:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-10 19:10:59 +0100 |
| commit | ce2ac7d2d2413074f9855acbaa7be0b4d5d726e4 (patch) | |
| tree | 687c943d5ed8e7548f6c7f3888b701f99a33cde1 /libpod/networking_linux.go | |
| parent | da01191aa3526e3a77d9a055e23c318c26720785 (diff) | |
| parent | b7b5b6f8e3072530f4c3fc07e5960e54c90729b5 (diff) | |
| download | podman-ce2ac7d2d2413074f9855acbaa7be0b4d5d726e4.tar.gz podman-ce2ac7d2d2413074f9855acbaa7be0b4d5d726e4.tar.bz2 podman-ce2ac7d2d2413074f9855acbaa7be0b4d5d726e4.zip | |
Merge pull request #8251 from baude/networkaliases
network aliases for container creation
Diffstat (limited to 'libpod/networking_linux.go')
| -rw-r--r-- | libpod/networking_linux.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go index 28dca8dd8..4bc9381bd 100644 --- a/libpod/networking_linux.go +++ b/libpod/networking_linux.go @@ -105,6 +105,13 @@ func (r *Runtime) configureNetNS(ctr *Container, ctrNS ns.NetNS) ([]*cnitypes.Re podName := getCNIPodName(ctr) podNetwork := r.getPodNetwork(ctr.ID(), podName, ctrNS.Path(), ctr.config.Networks, ctr.config.PortMappings, requestedIP, requestedMAC) + aliases, err := ctr.runtime.state.GetAllNetworkAliases(ctr) + if err != nil { + return nil, err + } + if len(aliases) > 0 { + podNetwork.Aliases = aliases + } results, err := r.netPlugin.SetUpPod(podNetwork) if err != nil { |