diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-02 05:53:15 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-02 05:53:15 -0500 |
| commit | 2314af70bdacf75135a11b48b87dba8e461a43ea (patch) | |
| tree | b5083d04cb87739a1ff38295fc1fa0b4fadc90e3 /libpod/network/netconflist.go | |
| parent | 52575db9b40ad141dc5521d7646e8ed636651b54 (diff) | |
| parent | e11d8f15e8d7559bc70ebef2dd0125be9d692da5 (diff) | |
| download | podman-2314af70bdacf75135a11b48b87dba8e461a43ea.tar.gz podman-2314af70bdacf75135a11b48b87dba8e461a43ea.tar.bz2 podman-2314af70bdacf75135a11b48b87dba8e461a43ea.zip | |
Merge pull request #9189 from baude/macvlandriver
add macvlan as a supported network driver
Diffstat (limited to 'libpod/network/netconflist.go')
| -rw-r--r-- | libpod/network/netconflist.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libpod/network/netconflist.go b/libpod/network/netconflist.go index 165a9067b..ca6a4a70b 100644 --- a/libpod/network/netconflist.go +++ b/libpod/network/netconflist.go @@ -177,9 +177,13 @@ func NewMacVLANPlugin(device string) MacVLANConfig { m := MacVLANConfig{ PluginType: "macvlan", - Master: device, IPAM: i, } + // CNI is supposed to use the default route if a + // parent device is not provided + if len(device) > 0 { + m.Master = device + } return m } |