v1.8 backports 2020-12-02 #14249
Merged
v1.8 backports 2020-12-02 #14249
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
maintainer-s-little-helper
bot
added
backport/1.8
kind/backports
|
@nathanjsweet This comment is probably still relevant #14213 (comment). |
[ upstream commit af6ca19 ] Previously, insertNeighbor() was assuming that a remote node is in the same L2 subnet, i.e. directly reachable w/o a gateway. However, this is not the case for all deployments. This commit adds a check for detecting whether the remote node is in the same L2. If it's not, then a gateway IP addr (nexthop) is going to be arpinged instead of the remote node IP addr. The missing bit in this commit is a refcounting to avoid redundant arpings and neigh removals when the gateway is used to access more than one remote node. Signed-off-by: Martynas Pumputis <m@lambda.lt> Signed-off-by: Nate Sweet <nathanjsweet@pm.me>
[ upstream commit b78b3b7 ] To avoid redundant pings and neigh entry removals when the entry is still used by other node (happens when two or more nodes can be accessed through the same gateway). Signed-off-by: Martynas Pumputis <m@lambda.lt> Signed-off-by: Nate Sweet <nathanjsweet@pm.me>
[ upstream commit 63f19d2 ] As reported by #14052, there can be a panic if the configured DirectRoutingDevice is not included in devices. (InitNodePortAddrs() is called with option.Config.Devices.) docs state that: If the direct routing device does not exist within devices, Cilium will add the device to the latter list. so this patch adds the device to the list. Fixes #14052 Signed-off-by: Kornilios Kourtis <kornilios@isovalent.com> Co-authored-by: Martynas Pumputis <m@lambda.lt> Signed-off-by: Nate Sweet <nathanjsweet@pm.me>
[ upstream commit 24d4450 ] This fixes a privileged runtime test failure caused by leaked goroutines on arpings with no response. Signed-off-by: Jarno Rajahalme <jarno@covalent.io> Signed-off-by: Nate Sweet <nathanjsweet@pm.me>
nathanjsweet
force-pushed
the
pr/v1.8-backport-2020-12-02
branch
from
99e1c0c
to
2021514
Compare
[ upstream commit 7b0037c ] This version fixes etcd error "auth token invalid after watch reconnects" etcd-io/etcd#11954. Signed-off-by: André Martins <andre@cilium.io>
|
@nathanjsweet I've added back in this PR. |
aanm
approved these changes
Dec 3, 2020
|
@aanm Done. @nathanjsweet Please include #14256 once it has been merged. |
[ upstream commit 354d42b ] /home/travis/gopath/src/github.com/cilium/cilium/pkg/datapath/linux/node_linux_test.go:1096:14: ineffectual assignment to err Reported-by: André Martins <andre@cilium.io> Fix: b78b3b7 ("node: Refcount neighbour entries") Signed-off-by: Martynas Pumputis <m@lambda.lt> Signed-off-by: Nate Sweet <nathanjsweet@pm.me>
|
test-backport-1.8 |
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.
v1.8 backports 2020-12-02
Once this PR is merged, you can update the PR labels via: