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.

Sign up for GitHub

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

Jump to bottom

Add support for rootless network-aliases and static ip/mac #8585

Merged
merged 2 commits into from
Jan 28, 2021
Merged

Add support for rootless network-aliases and static ip/mac #8585

merged 2 commits into from
Jan 28, 2021

Conversation

Luap99
Copy link
Member

@Luap99 Luap99 commented Dec 3, 2020 •
edited
Loading

Make sure we pass the ip and mac address as CNI_ARGS to
the cnitool which is executed in the rootless-cni-infra container.

Fixes #7842

Make sure we pass the network aliases as capability args to the
cnitool in the rootless-cni-infra container. Also update the
dnsname plugin in the cni-infra container.

Fixes #8567

@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 3, 2020
AkihiroSuda
AkihiroSuda reviewed Dec 7, 2020
View reviewed changes
contrib/rootless-cni-infra/rootless-cni-infra Outdated
fi
if [ "$CAP_ARGS" ]; then
CAP_ARGS="$CAP_ARGS"
export CAP_ARGS
Copy link
Collaborator

Choose a reason for hiding this comment

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

nit: export should be in L64: export CNI_ARGS CNI_IFNAME

@mheon mheon mentioned this pull request Dec 10, 2020
Closed
@trusch
Copy link
Contributor

trusch commented Dec 13, 2020

@Luap99 Hello! I just wanted to ask if I can help anyhow on this PR? I'm really interested in this feature and would love to do my part to make it happen!

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 25, 2020
@tmds
Copy link
Contributor

tmds commented Jan 11, 2021

I'm looking forward to use this! @Luap99 are you still working on this?

@Luap99
Copy link
Member Author

Luap99 commented Jan 11, 2021

I focus on #8910. This PR also contains a fix for this.

@Luap99
Copy link
Member Author

Luap99 commented Jan 27, 2021

@baude @mheon @vrothberg @rhatdan This is something that users would like to have for 3.0. It should also help docker-compose support for rootless users. If you agree that we should get this into 3.0 I would rebase but I need somebody to build and push the new rootless-cni-infra image to quay.io.

#8910 would also fix this but it is not ready.

Allow static ip and mac with rootless cni network
c717b3c 
Make sure we pass the ip and mac address as CNI_ARGS to
the cnitool which is executed in the rootless-cni-infra
container.

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

mheon commented Jan 27, 2021

Agree - if you can rebase, we can merge + backport so this is fixed for 3.0

@Luap99 Luap99 force-pushed the rootless-net-alias branch from 5da8794 to 9e0a521 Compare January 27, 2021 16:53
@openshift-ci-robot
Copy link
Collaborator

[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

@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jan 27, 2021
@Luap99 Luap99 force-pushed the rootless-net-alias branch from 9e0a521 to 78f355f Compare January 27, 2021 16:55
@Luap99
Copy link
Member Author

Luap99 commented Jan 27, 2021

OK. This one should be ready to build the image.

@Luap99 Luap99 changed the title WIP: Add support for rootless network-aliases WIP: Add support for rootless network-aliases and static ip/mac Jan 27, 2021
@Luap99 Luap99 mentioned this pull request Jan 27, 2021
Closed
@mheon
Copy link
Member

mheon commented Jan 27, 2021

LGTM on my end. @containers/podman-maintainers PTAL and merge, we can get the image built subsequently.
@Luap99 OK to remove the WIP?

Luap99
Luap99 commented Jan 27, 2021
View reviewed changes
libpod/rootless_cni_linux.go Outdated Show resolved Hide resolved
Add support for rootless network-aliases
1fac436 
Make sure we pass the network aliases as capability args to the
cnitool in the rootless-cni-infra container. Also update the
dnsname plugin in the cni-infra container.

Fixes containers#8567

Signed-off-by: Paul Holzinger <[email protected]>
@Luap99 Luap99 force-pushed the rootless-net-alias branch from 78f355f to 1fac436 Compare January 27, 2021 20:01
@Luap99 Luap99 changed the title WIP: Add support for rootless network-aliases and static ip/mac Add support for rootless network-aliases and static ip/mac Jan 27, 2021
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 27, 2021
@rhatdan
Copy link
Member

rhatdan commented Jan 28, 2021

Great job @Luap99
/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 28, 2021
@openshift-merge-robot openshift-merge-robot merged commit fb653c4 into containers:master Jan 28, 2021
@Luap99 Luap99 mentioned this pull request Jan 28, 2021
Merged
@Luap99 Luap99 deleted the rootless-net-alias branch January 28, 2021 14:12
@edsantiago edsantiago mentioned this pull request Jan 28, 2021
Closed
@trusch trusch mentioned this pull request Feb 2, 2021
Closed
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 23, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 23, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@AkihiroSuda AkihiroSuda AkihiroSuda left review comments

@mheon mheon mheon left review comments

Assignees

@rhatdan rhatdan

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Milestone
No milestone
8 participants
@Luap99 @trusch @tmds @mheon @openshift-ci-robot @rhatdan @AkihiroSuda @openshift-merge-robot