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

ipmasq: Add default nonMasq CIDRs if config is empty #11409

Merged
merged 2 commits into from May 11, 2020
Merged

ipmasq: Add default nonMasq CIDRs if config is empty #11409

merged 2 commits into from May 11, 2020

Conversation

brb
Copy link
Member

@brb brb commented May 7, 2020

To align better with the vanilla ip-masq-agent, add CIDRs from private IPv4 addr space if ip-masq-agent config is empty or missing.

Also, add a support for masqLinkLocal which controls whether masq'ing to the link local cidr should be enabled.

Depends on #11387 to be merged first.

@brb brb added kind/feature This introduces new functionality. area/daemon Impacts operation of the Cilium daemon. release-note/minor This PR changes functionality that users may find relevant to operating Cilium. labels May 7, 2020
@brb brb requested a review from a team May 7, 2020 15:03
@brb brb requested a review from a team as a code owner May 7, 2020 15:03
@maintainer-s-little-helper maintainer-s-little-helper bot added this to In progress in 1.8.0 May 7, 2020
@brb
Copy link
Member Author

brb commented May 7, 2020

test-me-please

@brb brb force-pushed the pr/brb/ipmasq-auto-cidrs branch from d76920a to 010b4df Compare May 7, 2020 15:28
@brb
Copy link
Member Author

brb commented May 7, 2020

test-me-please

@brb
Copy link
Member Author

brb commented May 7, 2020

test-focus K8sDatapathConfig*

@coveralls
Copy link

coveralls commented May 7, 2020 •
edited

Coverage Status

Coverage increased (+0.009%) to 37.887% when pulling 85450a0 on pr/brb/ipmasq-auto-cidrs into dac186c on master.

@brb brb force-pushed the pr/brb/ipmasq-auto-cidrs branch 2 times, most recently from 2d98d2f to 6178a6f Compare May 7, 2020 20:55
@brb
Copy link
Member Author

brb commented May 7, 2020

test-me-please

@brb
Copy link
Member Author

brb commented May 7, 2020

test-focus K8sDatapathConfig*

@brb brb force-pushed the pr/brb/ipmasq-auto-cidrs branch from 6178a6f to c6470ad Compare May 8, 2020 06:42
@brb
Copy link
Member Author

brb commented May 8, 2020

CI failed:

[2020-05-07T22:11:06.522Z] Bringing machine 'k8s2-1.18' up with 'virtualbox' provider...
[2020-05-07T22:11:06.522Z] ==> k8s2-1.18: Cloning VM...
[2020-05-07T22:11:06.522Z] /opt/vagrant/embedded/gems/2.2.4/gems/vagrant-2.2.4/lib/vagrant/machine.rb:337:in `close': No space left on device @ fptr_finalize_flush - /home/jenkins/workspace/Cilium-PR-Ginkgo-Tests-Validated/k8s-1.18-gopath/src/github.com/cilium/cilium/test/.vagrant/machines/k8s2-1.18/virtualbox/index_uuid (Errno::ENOSPC)

@brb
Copy link
Member Author

brb commented May 8, 2020

test-me-please

@brb
Copy link
Member Author

brb commented May 8, 2020

test-focus K8sDatapathConfig*

@brb
ipmasq: Add default nonMasq CIDRs if config is empty
e33f206 
To align with the vanilla ip-masq-agent, add CIDRs from private IPv4
addr space if ip-masq-agent config is empty.

Also, add a support for "masqLinkLocal" which controls whether masq'ing
to link local cidr should be enabled.

Signed-off-by: Martynas Pumputis <m@lambda.lt>
@brb brb force-pushed the pr/brb/ipmasq-auto-cidrs branch from c6470ad to 85450a0 Compare May 8, 2020 12:37
@brb brb requested a review from a team as a code owner May 8, 2020 12:37
@brb brb requested a review from a team May 8, 2020 12:37
@brb
helm: Get rid of unused ipMasqAgent.syncPeriod
85450a0 
The Cilium's ip-masq-agent has switched to fsnotify instead of polling,
so the option is no longer used.

Signed-off-by: Martynas Pumputis <m@lambda.lt>
@brb brb requested a review from aanm May 8, 2020 12:38
@brb
Copy link
Member Author

brb commented May 8, 2020

test-me-please

@tgraf tgraf merged commit 36977aa into master May 11, 2020
1.8.0 automation moved this from In progress to Merged May 11, 2020
@tgraf tgraf deleted the pr/brb/ipmasq-auto-cidrs branch May 11, 2020 08:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tgraf tgraf tgraf approved these changes

@aanm aanm aanm approved these changes

Assignees
No one assigned
Labels
area/daemon Impacts operation of the Cilium daemon. kind/feature This introduces new functionality. release-note/minor This PR changes functionality that users may find relevant to operating Cilium.
Projects
No open projects
1.8.0
  
Merged
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@brb @coveralls @tgraf @aanm