diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-02-11 16:46:08 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-11 16:46:08 -0500 |
| commit | 1b22ad95c172acc70af0a7c2d2145aa02353c02b (patch) | |
| tree | 3b4f73a7185ba5cd844e099fccc3c87e894e09f9 /pkg | |
| parent | 564404b4fa7eea5d93756627ce98ca68fd19a72b (diff) | |
| parent | 4b90542d5be977db79abbbfc442aca3553024246 (diff) | |
| download | podman-1b22ad95c172acc70af0a7c2d2145aa02353c02b.tar.gz podman-1b22ad95c172acc70af0a7c2d2145aa02353c02b.tar.bz2 podman-1b22ad95c172acc70af0a7c2d2145aa02353c02b.zip | |
Merge pull request #13214 from adrianreber/2022-02-11-fix-tests
Fix checkpoint/restore pod tests
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 != "" { |