diff options
| author | Adrian Reber <areber@redhat.com> | 2022-02-11 10:16:02 +0000 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2022-02-16 13:58:40 -0500 |
| commit | d77b4f92c013b0d8773750abb75ca7816454e8a3 (patch) | |
| tree | d0365324b6d952fba11bdcea4e51c6b4083d48e8 /pkg | |
| parent | a72e22160a2cf4fcf868d7095bcdf9eb5e92f3cd (diff) | |
| download | podman-d77b4f92c013b0d8773750abb75ca7816454e8a3.tar.gz podman-d77b4f92c013b0d8773750abb75ca7816454e8a3.tar.bz2 podman-d77b4f92c013b0d8773750abb75ca7816454e8a3.zip | |
Fix checkpoint/restore pod tests
Checkpoint/restore pod tests are not running with an older runc and now
that runc 1.1.0 appears in the repositories it was detected that the
tests were failing. This was not detected in CI as CI was not using runc
1.1.0 yet.
Signed-off-by: Adrian Reber <areber@redhat.com>
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/checkpoint/checkpoint_restore.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkg/checkpoint/checkpoint_restore.go b/pkg/checkpoint/checkpoint_restore.go index 1ebd6a455..270b5b6c4 100644 --- a/pkg/checkpoint/checkpoint_restore.go +++ b/pkg/checkpoint/checkpoint_restore.go @@ -140,6 +140,13 @@ func CRImportCheckpoint(ctx context.Context, runtime *libpod.Runtime, restoreOpt return nil, errors.Errorf("pod %s does not share the network namespace", ctrConfig.Pod) } ctrConfig.NetNsCtr = infraContainer.ID() + for net, opts := range ctrConfig.Networks { + opts.StaticIPs = nil + opts.StaticMAC = nil + ctrConfig.Networks[net] = opts + } + ctrConfig.StaticIP = nil + ctrConfig.StaticMAC = nil } if ctrConfig.PIDNsCtr != "" { |