diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-01 21:43:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-01 21:43:27 +0100 |
| commit | b7ff6f09121eee8a0444baede9f6c84cc1f12b71 (patch) | |
| tree | dcedf6e0674998f3da09a51fe5e48510297ee2c4 /libpod/network/create.go | |
| parent | 4b5cb7b1de3caecf0f78f264d5931066851c6a37 (diff) | |
| parent | 8494bcb866f1c0978cbe35c62c1e3312a91040b4 (diff) | |
| download | podman-b7ff6f09121eee8a0444baede9f6c84cc1f12b71.tar.gz podman-b7ff6f09121eee8a0444baede9f6c84cc1f12b71.tar.bz2 podman-b7ff6f09121eee8a0444baede9f6c84cc1f12b71.zip | |
Merge pull request #8505 from Luap99/network-labels
podman network label support
Diffstat (limited to 'libpod/network/create.go')
| -rw-r--r-- | libpod/network/create.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/network/create.go b/libpod/network/create.go index 7e4fc574a..cac438963 100644 --- a/libpod/network/create.go +++ b/libpod/network/create.go @@ -169,7 +169,7 @@ func createBridge(name string, options entities.NetworkCreateOptions, runtimeCon } // create CNI plugin configuration - ncList := NewNcList(name, version.Current()) + ncList := NewNcList(name, version.Current(), options.Labels) var plugins []CNIPlugins // TODO need to iron out the role of isDefaultGW and IPMasq bridge := NewHostLocalBridge(bridgeDeviceName, isGateway, false, ipMasq, ipamConfig) @@ -223,7 +223,7 @@ func createMacVLAN(name string, options entities.NetworkCreateOptions, runtimeCo return "", err } } - ncList := NewNcList(name, version.Current()) + ncList := NewNcList(name, version.Current(), options.Labels) macvlan := NewMacVLANPlugin(options.MacVLAN) plugins = append(plugins, macvlan) ncList["plugins"] = plugins |