diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-03 05:00:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-03 05:00:24 -0500 |
| commit | 97421651d3821a03eab319befdedcf554c31a2f9 (patch) | |
| tree | 1ed7aba24817c7ad8d57b5d90b272857ab46a610 /libpod/network/config.go | |
| parent | 881f3d788d48b683e674d1f9778d581370c9c11e (diff) | |
| parent | bd0e22ed14ca09a7b656f4603c13aac3a4066968 (diff) | |
| download | podman-97421651d3821a03eab319befdedcf554c31a2f9.tar.gz podman-97421651d3821a03eab319befdedcf554c31a2f9.tar.bz2 podman-97421651d3821a03eab319befdedcf554c31a2f9.zip | |
Merge pull request #9204 from baude/macvlanextra
Honor network options for macvlan networks
Diffstat (limited to 'libpod/network/config.go')
| -rw-r--r-- | libpod/network/config.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libpod/network/config.go b/libpod/network/config.go index ce351129e..294e23509 100644 --- a/libpod/network/config.go +++ b/libpod/network/config.go @@ -103,7 +103,9 @@ func (p PortMapConfig) Bytes() ([]byte, error) { // IPAMDHCP describes the ipamdhcp config type IPAMDHCP struct { - DHCP string `json:"type"` + DHCP string `json:"type"` + Routes []IPAMRoute `json:"routes,omitempty"` + Ranges [][]IPAMLocalHostRangeConf `json:"ranges,omitempty"` } // MacVLANConfig describes the macvlan config @@ -111,6 +113,7 @@ type MacVLANConfig struct { PluginType string `json:"type"` Master string `json:"master"` IPAM IPAMDHCP `json:"ipam"` + MTU int `json:"mtu,omitempty"` } // Bytes outputs the configuration as []byte |