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 | |
| 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
| -rw-r--r-- | libpod/networking_linux.go | 2 | ||||
| -rw-r--r-- | test/e2e/network_connect_disconnect_test.go | 7 |
2 files changed, 8 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()) diff --git a/test/e2e/network_connect_disconnect_test.go b/test/e2e/network_connect_disconnect_test.go index eb8ad7181..e9a7b421f 100644 --- a/test/e2e/network_connect_disconnect_test.go +++ b/test/e2e/network_connect_disconnect_test.go @@ -193,6 +193,13 @@ var _ = Describe("Podman network connect and disconnect", func() { exec = podmanTest.Podman([]string{"exec", "-it", "test", "ip", "addr", "show", "eth1"}) exec.WaitWithDefaultTimeout() Expect(exec.ExitCode()).To(BeZero()) + + // make sure no logrus errors are shown https://github.com/containers/podman/issues/9602 + rm := podmanTest.Podman([]string{"rm", "-f", "test"}) + rm.WaitWithDefaultTimeout() + Expect(rm.ExitCode()).To(BeZero()) + Expect(rm.ErrorToString()).To(Equal("")) + }) It("podman network connect when not running", func() { |