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

New global option interface_name in containers.conf #1814

Merged
merged 1 commit into from
Jan 26, 2024
Merged

New global option interface_name in containers.conf #1814

merged 1 commit into from
Jan 26, 2024

Conversation

vikas-goel
Copy link
Contributor

@vikas-goel vikas-goel commented Jan 20, 2024

Add a new containers.conf attribute to define how to set interface name inside containers.
Related to containers/podman#21313

Signed-off-by: Vikas Goel [email protected]

pkg/config/config.go Outdated Show resolved Hide resolved
@rhatdan
Copy link
Member

rhatdan commented Jan 20, 2024

You must sign your commits.

@Luap99 PTAL

@vikas-goel
Copy link
Contributor Author

You must sign your commits.

@Luap99 PTAL

Thanks for the quick look @rhatdan

pkg/config/config.go Outdated Show resolved Hide resolved
@vikas-goel
Copy link
Contributor Author

Can we have this PR reviewed? The corresponding podman PR, too, is ready containers/podman#21318 waiting for this one.

Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

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

What should happen if the is no NetworkInterface given in the network config (it is optional for macvlan/ipvlan)? I assume you fall back to the ethX pattern?

docs/containers.conf.5.md Outdated Show resolved Hide resolved
@vikas-goel
Copy link
Contributor Author

What should happen if the is no NetworkInterface given in the network config (it is optional for macvlan/ipvlan)? I assume you fall back to the ethX pattern?

Yes, falls back to the existing ethX pattern as mentioned in the podman PR and the new test cases developed in there.

@vikas-goel
Copy link
Contributor Author

Review comments incorporated.

pkg/config/testdata/containers_override.conf Outdated Show resolved Hide resolved
pkg/config/containers.conf Outdated Show resolved Hide resolved
Add a new containers.conf attribute to define how to set interface name inside containers.

Relates to: containers/podman#21313

Signed-off-by: Vikas Goel <[email protected]>
@vikas-goel
Copy link
Contributor Author

@Luap99 , please review.

Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

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

LGTM

@Luap99
Copy link
Member

Luap99 commented Jan 26, 2024

@mheon PTAL

@mheon
Copy link
Member

mheon commented Jan 26, 2024

/lgtm

@rhatdan
Copy link
Member

rhatdan commented Jan 26, 2024

/approve
Thanks @vikas-goel

Copy link
Contributor

openshift-ci bot commented Jan 26, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rhatdan, vikas-goel

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

@openshift-merge-bot openshift-merge-bot bot merged commit 5d6ba3b into containers:main Jan 26, 2024
7 checks passed
@vikas-goel
Copy link
Contributor Author

Thanks @Luap99 , @rhatdan , @mheon . When will this get promoted to the podman repo?

@rhatdan
Copy link
Member

rhatdan commented Jan 26, 2024

podman 5.0 Next month.

@Luap99
Copy link
Member

Luap99 commented Jan 26, 2024

@vikas-goel I let you once the version is updated in podman then you can rebase your podman PR, it should be sometime next week.

@vikas-goel
Copy link
Contributor Author

Thanks @Luap99

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.

None yet

4 participants