Skip to content

network: add ManageForeignRoutingPolicyRules= boolean setting - #19287

Merged
yuwata merged 3 commits into
systemd:mainfrom
yuwata:network-manage-foreign-routing-policy-rule-19106
Apr 14, 2021
Merged

network: add ManageForeignRoutingPolicyRules= boolean setting#19287
yuwata merged 3 commits into
systemd:mainfrom
yuwata:network-manage-foreign-routing-policy-rule-19106

Conversation

@yuwata

@yuwata yuwata commented Apr 11, 2021

Copy link
Copy Markdown
Member

The commit 0b81225 makes that networkd remove all foreign rules except those with "proto kernel".

But, in some situation, people may want to manage routing policy rules with other tools, e.g. 'ip' command. To support such the situation, this introduce ManageForeignRoutingPolicyRules= boolean setting.

Closes #19106.

@keszybz keszybz left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM. Yet-another config option is not great, but we already have ManagerForeingRoutes=, and this one is conceptually very similar. I don't see a nice way to make this automatic.

Comment thread man/networkd.conf.xml Outdated
yuwata added 3 commits April 13, 2021 12:07
…n networkd.conf

The commit 0b81225 makes that networkd
remove all foreign rules except those with "proto kernel".

But, in some situation, people may want to manage routing policy rules
with other tools, e.g. 'ip' command. To support such the situation,
this introduce ManageForeignRoutingPolicyRules= boolean setting.

Closes systemd#19106.
@yuwata
yuwata force-pushed the network-manage-foreign-routing-policy-rule-19106 branch from 719eb5e to 4de5ad8 Compare April 13, 2021 03:41
@yuwata yuwata added good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed and removed good-to-merge/with-minor-suggestions labels Apr 13, 2021
@yuwata

yuwata commented Apr 13, 2021

Copy link
Copy Markdown
Member Author

@keszybz Thank you for the review and the suggestion. The document is updated accordingly. The explanation for ManageForeignRoutes= is also updated based on your suggestion. PTAL.
Upgrading the green label.

@yuwata
yuwata force-pushed the network-manage-foreign-routing-policy-rule-19106 branch from 4de5ad8 to 3fe23a9 Compare April 14, 2021 03:23
@yuwata
yuwata merged commit a2b1572 into systemd:main Apr 14, 2021
@yuwata
yuwata deleted the network-manage-foreign-routing-policy-rule-19106 branch April 14, 2021 10:01
@hligit

hligit commented Sep 1, 2021

Copy link
Copy Markdown

@yuwata could this be backported to v247/v248? The removing of foreign routing rules breaks AWS-CNI aws/amazon-vpc-cni-k8s#1600

@yuwata

yuwata commented Sep 2, 2021

Copy link
Copy Markdown
Member Author

@hligit Oh, yes, it should be. The commit 0b81225 is included in v248, and backported to v247-stable. So this PR should be also backported to them, as this is follow-ups for the commit. I will prep PRs to backport this for stable branches.

@yuwata

yuwata commented Sep 2, 2021

Copy link
Copy Markdown
Member Author

@hligit

hligit commented Sep 2, 2021

Copy link
Copy Markdown

@yuwata Legendary! Thanks for the swift actions!

@yuwata

yuwata commented Sep 2, 2021

Copy link
Copy Markdown
Member Author

@hligit The backporting PRs are merged.

@keszybz keszybz removed the good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed label Sep 2, 2021
@hligit

hligit commented Sep 7, 2021

Copy link
Copy Markdown

@yuwata Since the file src/network/networkd-routing-policy-rule.c is about routing policy rules, I wonder if !m->manage_foreign_routes here should be !m->manage_foreign_rules instead?

@yuwata

yuwata commented Sep 7, 2021

Copy link
Copy Markdown
Member Author

Ugh... Will fix soon. Thank you.

@yuwata

yuwata commented Sep 7, 2021

Copy link
Copy Markdown
Member Author

Backports:
v247: systemd/systemd-stable#118
v248: systemd/systemd-stable#119
v249: systemd/systemd-stable#120

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Development

Successfully merging this pull request may close these issues.

systemd-networkd removes fwmark rules (created by iproute2 command) on restart

3 participants