From 044edbb9c9e798e1848682fa0e5389791296f2cb Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Thu, 18 Nov 2021 19:05:32 +0100 Subject: Fix netavark error handling and teardown issue The return error was not returned by podman , instead a different error was created. Also make sure to free assigned ips on an error to not leak them. Lastly podman container cleanup uses the default network backend instead of the provided one, we need to add `--network-backend` to the exit command. [NO NEW TESTS NEEDED] Signed-off-by: Paul Holzinger --- pkg/specgenutil/util.go | 1 + 1 file changed, 1 insertion(+) (limited to 'pkg/specgenutil/util.go') diff --git a/pkg/specgenutil/util.go b/pkg/specgenutil/util.go index 534374e71..6b564c60e 100644 --- a/pkg/specgenutil/util.go +++ b/pkg/specgenutil/util.go @@ -295,6 +295,7 @@ func CreateExitCommandArgs(storageConfig storageTypes.StoreOptions, config *conf "--cgroup-manager", config.Engine.CgroupManager, "--tmpdir", config.Engine.TmpDir, "--cni-config-dir", config.Network.NetworkConfigDir, + "--network-backend", config.Network.NetworkBackend, } if config.Engine.OCIRuntime != "" { command = append(command, []string{"--runtime", config.Engine.OCIRuntime}...) -- cgit v1.2.3-54-g00ecf