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

fqdn: Make maximum number of IPs per restored rule configurable #13992

Merged
merged 1 commit into from
Nov 12, 2020

Conversation

jrajahalme
Copy link
Member

@jrajahalme jrajahalme commented Nov 12, 2020

Only count the number of IPs for each FQDN selector/rule when storing
rules for restoration, rather than ignoring later rules on a port
after previous rules have hit the maximum number of IPs.

Make the maximum number of IPs per restored rule configurable with the
new option --tofqdns-max-ips-per-restored-rule (default 1000).

Signed-off-by: Jarno Rajahalme jarno@covalent.io

FQDN rule restoration IP limit has been made configurable (`--tofqdns-max-ips-per-restored-rule`, default 1000).

@jrajahalme jrajahalme added kind/bug This is a bug in the Cilium logic. release-note/bug This PR fixes an issue in a previous release of Cilium. labels Nov 12, 2020
@jrajahalme jrajahalme requested a review from a team November 12, 2020 01:52
@jrajahalme jrajahalme requested a review from a team as a code owner November 12, 2020 01:52
@maintainer-s-little-helper maintainer-s-little-helper bot added this to In progress in 1.10.0 Nov 12, 2020
Only count the number of IPs for each FQDN selector/rule when storing
rules for restoration, rather than ignoring later rules on a port
after previous rules have hit the maximum number of IPs.

Make the maximum number of IPs per restored rule configurable with the
new option '--tofqdns-max-ips-per-restored-rule' (default 1000).

Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
@jrajahalme jrajahalme force-pushed the pr/jrajahalme/fwdn-make-restore-IP-limit-configurable branch from af3944f to 4f364ea Compare November 12, 2020 01:52
@jrajahalme
Copy link
Member Author

test-me-please

Copy link
Member

@christarazi christarazi left a comment

Choose a reason for hiding this comment

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

LGTM, one minor nit.

@@ -193,7 +193,7 @@ func (s *DNSProxyTestSuite) SetUpTest(c *C) {
s.dnsServer = setupServer(c)
c.Assert(s.dnsServer, Not(IsNil), Commentf("unable to setup DNS server"))

proxy, err := StartDNSProxy("", 0, true, // any address, any port, enable compression
proxy, err := StartDNSProxy("", 0, true, 1000, // any address, any port, enable compression, max 1000 restore IPs
Copy link
Member

Choose a reason for hiding this comment

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

Might make sense to use the new default here instead of hardcoding 1000.

@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.8.6 Nov 12, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.7.12 Nov 12, 2020
@jrajahalme
Copy link
Member Author

v1.7 backport in #13993

Copy link
Member

@kaworu kaworu left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

Copy link
Member

@jibi jibi left a comment

Choose a reason for hiding this comment

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

Agent changes LGTM 👍

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Nov 12, 2020
@aanm aanm merged commit 871e7e1 into master Nov 12, 2020
@aanm aanm deleted the pr/jrajahalme/fwdn-make-restore-IP-limit-configurable branch November 12, 2020 12:37
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.7 in 1.7.12 Nov 12, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.7 in 1.7.12 Nov 12, 2020
jrajahalme added a commit that referenced this pull request Nov 12, 2020
Restored DNS proxy rules are DNS rules, not ToFQDNs rules.

Fixes: #13991
Fixes: #13992
Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
@joestringer joestringer added this to Backport pending to v1.9 in 1.9.1 Nov 17, 2020
nathanjsweet pushed a commit that referenced this pull request Nov 18, 2020
Restored DNS proxy rules are DNS rules, not ToFQDNs rules.

Fixes: #13991
Fixes: #13992
Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.7 to Needs backport from master in 1.7.12 Nov 18, 2020
jrajahalme added a commit that referenced this pull request Nov 18, 2020
[ upstream commit a218052 ]

Restored DNS proxy rules are DNS rules, not ToFQDNs rules.

Fixes: #13991
Fixes: #13992
Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.7 in 1.7.12 Nov 18, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.8 to Backport done to v1.8 in 1.8.6 Nov 18, 2020
kaworu pushed a commit that referenced this pull request Nov 19, 2020
[ upstream commit a218052 ]

Restored DNS proxy rules are DNS rules, not ToFQDNs rules.

Fixes: #13991
Fixes: #13992

v1.8 backport: fixed conflict on Documentation/cmdref/cilium-agent.md
and pkg/option/config.go:2461

Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
Signed-off-by: Alexandre Perrin <alex@kaworu.ch>
kaworu pushed a commit that referenced this pull request Nov 19, 2020
[ upstream commit a218052 ]

Restored DNS proxy rules are DNS rules, not ToFQDNs rules.

Fixes: #13991
Fixes: #13992
Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
Signed-off-by: Alexandre Perrin <alex@kaworu.ch>
joestringer pushed a commit that referenced this pull request Nov 21, 2020
[ upstream commit a218052 ]

Restored DNS proxy rules are DNS rules, not ToFQDNs rules.

Fixes: #13991
Fixes: #13992
Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
Signed-off-by: Alexandre Perrin <alex@kaworu.ch>
joestringer pushed a commit that referenced this pull request Nov 21, 2020
[ upstream commit a218052 ]

Restored DNS proxy rules are DNS rules, not ToFQDNs rules.

Fixes: #13991
Fixes: #13992
Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.7 to Backport done to v1.7 in 1.7.12 Nov 23, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.7 to Backport done to v1.7 in 1.7.12 Nov 23, 2020
kaworu pushed a commit that referenced this pull request Nov 26, 2020
[ upstream commit a218052 ]

Restored DNS proxy rules are DNS rules, not ToFQDNs rules.

Fixes: #13991
Fixes: #13992

v1.8 backport: fixed conflict on Documentation/cmdref/cilium-agent.md
and pkg/option/config.go:2461

Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
Signed-off-by: Alexandre Perrin <alex@kaworu.ch>
aanm pushed a commit that referenced this pull request Nov 30, 2020
[ upstream commit a218052 ]

Restored DNS proxy rules are DNS rules, not ToFQDNs rules.

Fixes: #13991
Fixes: #13992

v1.8 backport: fixed conflict on Documentation/cmdref/cilium-agent.md
and pkg/option/config.go:2461

Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
Signed-off-by: Alexandre Perrin <alex@kaworu.ch>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug This is a bug in the Cilium logic. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/bug This PR fixes an issue in a previous release of Cilium.
Projects
No open projects
1.7.12
Backport done to v1.7
1.8.6
Backport done to v1.8
1.9.1
Backport pending to v1.9
Development

Successfully merging this pull request may close these issues.

None yet

8 participants