Allow --ip and --mac to be set when joining a CNI net

[mheon]

These only conflict when joining more than one network. We can still set a single CNI network and set a static IP and/or static MAC.

Fixes #4500

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mheon

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 [mheon]

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

[mheon]

I'll add a test after lunch

[TomSweeneyRedHat]

LGTM
remote prune test died, I expect unrelated to this change. I restarted.

[giuseppe]

LGTM

[rhatdan]

@mheon Reminder on Tests.
Looks like the CI system is hung.

[mheon]

Added a test

[mheon]

Some test failures are (wierd) flakes, but it seems like --ip with --net $CNINETWORK is not working. I'm passing the right things into OCICNI, so the problem has to be there.

[vbohinc]

This does not work,

network.RuntimeConfig = map[string]ocicni.RuntimeConfig{
defaultNetwork: rt,
}

is always set to the "podman" netconf, so the static allocations do not get applied.

The problem is that defaultNetwork = r.netPlugin.GetDefaultNetworkName() returns "podman" instead of the user provided value.

Ugly hack I'm using to set defaultNetwork:

if len(networks) == 0 {
defaultNetwork = r.netPlugin.GetDefaultNetworkName()
} else {
defaultNetwork = networks[0]
}

[mheon]

Good catch - pushed an updated version that should set that properly

[mheon]

It's green.
@vrothberg @baude @TomSweeneyRedHat @rhatdan PTAL

[TomSweeneyRedHat]

LGTM

[rhatdan]

/lgtm