Use existing interface to request IP address during restore

[adrianreber]

The initial implementation to request the same IP address for a
container during a restore was based on environment variables
influencing CNI.

With this commit the IP address selection switches to Podman's internal
static IP API.

Signed-off-by: Adrian Reber [email protected]

[baude]

can you add an integration test for this please

[rhatdan]

/approve

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rhatdan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [rhatdan]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[rhatdan]

@adrianreber Can you answer @baude

[adrianreber]

@baude I will add a test to verify that the IP address is the same before and after checkpoint/restore.

I have to re-work this anyway to not modify c.config.

[adrianreber]

I also added a test to verify that the IP does not change after restoring from checkpoint and I re-enabled the test with established TCP connections.

[mheon]

Code looks fine over here, just a small comment from me

[adrianreber]

Is /bin/sh: easyjson: command not found a known CI failure or something I broke?

[mheon]

make .install.easyjson should grab the tool

[mheon]

Oh, it's failing in CI. Hmmm.

Try a rm libpod/container_easyjson.go; make easyjson_generate locally

[adrianreber]

Oh, it's failing in CI. Hmmm.

Yes, it is a CI failure.

Try a rm libpod/container_easyjson.go; make easyjson_generate locally

Doesn't change anything locally except removing pkg/sysinfo/sysinfo_linux.go~, which looks like an unrelated temporary file. The removal of that file does not sound like it will fix my CI easyjson problem.

[mheon]

Try squashing your commits down into one - it looks like it's failing trying to build an individual commit

[adrianreber]

Same CI failure (/bin/sh: easyjson: command not found) with different patch ordering as well as with squashing all commits together. Will have another look at it tomorrow.

[rhatdan]

Run the make locally to see if it creates a new json file.

[mheon]

Alright, going to take a shot at nuking easyjson from orbit. #2105

[adrianreber]

@mheon @rhatdan Thanks for all your help. I was finally able to solve it. The problem was that make saw that container.go was newer than container_easyjson.go, therefore it tried to re-create container_easyjson.go which failed because the tool easyjson was missing. make was right as I actually changed container.go but the change was in a place marked as ffjson: skip. That is why the locally generated container_easyjson.go was unchanged and not updated in git.

To solve it I changed a comment in container_easyjson.go and was able to commit it to git. Now it is newer than container.go and make does not want to run easyjson: all tests finally green.

[rhatdan]

LGTM
@mheon @baude @vrothberg @umohnani8 @giuseppe PTAL

[mheon]

/lgtm