v1.9 backports 2021-03-10 #15298
Merged
v1.9 backports 2021-03-10 #15298
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[ upstream commit 2a62b83 ] Using the NatMap interface was causing issues when trying to check if the natMap attribute is nil. We don't need the NatMap interface and can simply use *nat.Map directly. Suggested-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: Paul Chaignon <paul@cilium.io>
[ upstream commit 37ab40e ] Initialize the kube-proxy replacement options earlier in the agent startup, to ensure all options have reach their final state (based on kernel probes and option conflict) when we initialize the BPF map information (e.g., create or not NAT maps based on whether BPF NodePort is enabled). Signed-off-by: Paul Chaignon <paul@cilium.io>
[ upstream commit 602e5ce ] The IPv4 and IPv6 SNAT maps are only used if BPF NodePort is enabled. Commit cac5218 ("datapath: remove SNAT maps entries when kube-proxy is enabled") removed the maps on startup if BPF NodePort is disabled. We were however still creating them regardless of the BPF NodePort status. The creation started a controller which then fails once the actual map is removed. This commit fixes the issue by not creating the userspace object, including the controller, for the SNAT maps when BPF NodePort is disabled. Fixes: cac5218 ("datapath: remove SNAT maps entries when kube-proxy is enabled") Fixes: cilium#15141 Signed-off-by: Paul Chaignon <paul@cilium.io>
[ upstream commit 2b6e04f ] Signed-off-by: Sean Winn <sean@isovalent.com> Signed-off-by: Paul Chaignon <paul@cilium.io>
pchaigno
added
backport/1.9
kind/backports
|
test-backport-1.9 |
joestringer
approved these changes
Mar 10, 2021
|
CI is green except for Travis, which failed to trigger. I'll close&reopen to see if that triggers the run. |
|
I also validated that the unit tests pass locally (for amd64 at least). |
|
CI was previously green except for Travis CI. Travis CI is now green. I think this is ready to merge. |
pchaigno
added
the
ready-to-merge
|
@pchaigno the command in the PR description updates the statuses of the wrong PRs ;) I manually fixed up the labels to reflect reality. |
Whoops! All looks good now, thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Skipped:
Once this PR is merged, you can update the PR labels via: