Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libnetwork: verify static ip only for host-local ipam and allow mtu option for netavark macvlan driver #881

Merged
merged 2 commits into from
Jan 10, 2022

Conversation

Luap99
Copy link
Member

@Luap99 Luap99 commented Jan 10, 2022

libnetwork: only validate static ip when ipam is host-local

If the dhcp ipam driver is used podman does not know any subnets so we
cannot verify if the given static ip is in the subnet.

Fixes containers/podman#12762

libnetwork: netavark allow mtu option for macvlan

We have to support the mtu option for netavark since it is also
supported by CNI.

If the dhcp ipam driver is used podman does not know any subnets so we
cannot verify if the given static ip is in the subnet.

Fixes containers/podman#12762

Signed-off-by: Paul Holzinger <[email protected]>
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 10, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Luap99

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:

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

@rhatdan
Copy link
Member

rhatdan commented Jan 10, 2022

LGTM
@containers/podman-maintainers PTAL

@Luap99 Luap99 changed the title libnetwork: verify static ip onlt for host-local ipam and allow mtu option for netavark macvlan driver libnetwork: verify static ip only for host-local ipam and allow mtu option for netavark macvlan driver Jan 10, 2022
Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@vrothberg
Copy link
Member

/lgtm
/hold

@mheon
Copy link
Member

mheon commented Jan 10, 2022

Tests red, otherwise LGTM

We have to support the mtu option for netavark since it is also
supported by CNI.

Signed-off-by: Paul Holzinger <[email protected]>
@Luap99
Copy link
Member Author

Luap99 commented Jan 10, 2022

merge me

@rhatdan
Copy link
Member

rhatdan commented Jan 10, 2022

/lgtm
/hold cancel

@openshift-ci openshift-ci bot added the lgtm label Jan 10, 2022
@openshift-merge-robot openshift-merge-robot merged commit 08c2c97 into containers:main Jan 10, 2022
@Luap99 Luap99 deleted the libnetwork branch January 10, 2022 17:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Restoring a checkpoint fails: requested static ip not in any subnet on network podman
5 participants