diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-03-04 09:18:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-04 09:18:21 -0500 |
| commit | 17cacea3fa2bf0df20572720b9a0a3be35f2ef7b (patch) | |
| tree | f157c1d067bd1baf967b88d9922feeeb540d9735 /libpod | |
| parent | 833670079c5b1f95fbb7c9bb8ba9095f1c66c7b4 (diff) | |
| parent | aa0a57f095b569f8c80e3622b48305209747533a (diff) | |
| download | podman-17cacea3fa2bf0df20572720b9a0a3be35f2ef7b.tar.gz podman-17cacea3fa2bf0df20572720b9a0a3be35f2ef7b.tar.bz2 podman-17cacea3fa2bf0df20572720b9a0a3be35f2ef7b.zip | |
Merge pull request #9614 from Luap99/fix-9602
Fix cni teardown errors
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/networking_linux.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go index 0526e646e..d6968a6b5 100644 --- a/libpod/networking_linux.go +++ b/libpod/networking_linux.go @@ -809,7 +809,7 @@ func (r *Runtime) teardownCNI(ctr *Container) error { requestedMAC = ctr.config.StaticMAC } - podNetwork := r.getPodNetwork(ctr.ID(), ctr.Name(), ctr.state.NetNS.Path(), networks, ctr.config.PortMappings, requestedIP, requestedMAC, ContainerNetworkDescriptions{}) + podNetwork := r.getPodNetwork(ctr.ID(), ctr.Name(), ctr.state.NetNS.Path(), networks, ctr.config.PortMappings, requestedIP, requestedMAC, ctr.state.NetInterfaceDescriptions) if err := r.netPlugin.TearDownPod(podNetwork); err != nil { return errors.Wrapf(err, "error tearing down CNI namespace configuration for container %s", ctr.ID()) |