v1.8 backports 2021-05-21 #16276
Merged
v1.8 backports 2021-05-21 #16276
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
nbusseneau
added
backport/1.8
kind/backports
|
Sorry, I made a mistake with my fork and accidentally closed all my PRs. Reopening. |
brb
approved these changes
May 25, 2021
bmcustodio
requested changes
May 25, 2021
There was a problem hiding this comment.
#16123 -- docs: add ids to the list of special identities (@bmcustodio)
Hmmm I don't actually see my commit 🤔
|
@bmcustodio PTAL, I added back two missing commits that were improperly cherry-picked and left in a dangling state (my bad). |
|
test-backport-1.8 |
bmcustodio
approved these changes
May 27, 2021
There was a problem hiding this comment.
#16123 -- docs: add ids to the list of special identities (@bmcustodio)
LGTM 👍
|
test-upstream-k8s |
|
There's an issue with the upstream job while tagging Not sure if it's due to the PR or something else, 1.8 upstream jobs seem to be aborting due to failing to boot images since May 18: https://jenkins.cilium.io/view/Cilium-v1.8/job/cilium-v1.8-k8s-upstream/ Runtime seems to have the same kind of provisioning issues: https://jenkins.cilium.io/view/Cilium-v1.8/job/cilium-v1.8-runtime-4.9/ EDIT: found the cause (Vagrant cache not having 1.8 images), fix inbound. |
|
test-upstream-k8s |
|
#16379 should fix the upstream boxes. What's the process? Are backport PRs "rebasable"? |
[ upstream commit bf750f6 ] We don't return early if arping was skipped. This can happen when insertNeighbor() is invoked by the non-refresh path and nexthop is not new. Make sure that lastPing is updated only if arping was sent and it was successful (if hwAddr != nil condition). Signed-off-by: Martynas Pumputis <m@lambda.lt> Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
[ upstream commit 6ee44ed ] We can inspect the neighLastPingByNextHop map to check when insertNeighbor() or deleteNeighbor() was called. Signed-off-by: Martynas Pumputis <m@lambda.lt> Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
[ upstream commit dd46cc1 ] It's possible that in the case of multiple concurrent insertNeighbor() executions the oldest (or older) goroutine will overwrite the latest arping result due to the fine-grained locking. To fix this, avoid updating neigh entry if we detect that prev last ping timestamp is after our arping timestamp. Signed-off-by: Martynas Pumputis <m@lambda.lt> Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
[ upstream commit 2299880 ] Previously, the default compile of bpf_network.o in the tree wouldn't compile with IPv4, IPv6, or IPSEC enabled, which limited its ability to catch compile failures at development time. Fix it up by adding these to the BPF_SIMPLE_OPTIONS. Signed-off-by: Joe Stringer <joe@cilium.io> Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
[ upstream commit ab5d9af ] Whenever we test ENABLE_IPSEC, also enable IP_POOLS which enables extra code in most circumstances, except in one or two situations where it is equivalent to the alternative (basically just determines which skb->cb0[] offset to use for storing encryption bits). Signed-off-by: Joe Stringer <joe@cilium.io> Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
[ upstream commit 4722a2b ] Add extra build options with this to catch build-time errors with/without this option. This is normally controlled by kernel version support, but we don't currently factor variants of such feature detection into the build testing. Signed-off-by: Joe Stringer <joe@cilium.io> Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
[ upstream commit 45689ec ] Fixes: cilium#16148 I have checked that 30s (instead of 10s) works as well. Signed-off-by: Christian Hörtnagl <christian2@univie.ac.at> Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
[ upstream commit 946f52c ] Document the common workflow that we've been working under. Signed-off-by: Chris Tarazi <chris@isovalent.com> Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
[ upstream commit 1cd5be9 ] By using built-in formatting primitives instead of independently fetching names and emails from git in separate commands, we can reduce git history iteration by 50%, saving 30s per authors update on my system. Signed-off-by: Joe Stringer <joe@cilium.io> Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
[ upstream commit 6d6ff65 ] Authors in the git log who have used the vagrant VM have always been repeat contributors who have resolved invalid git authorship issues in subsequent submissions, so there is no need to take these authors into account when calculating the authors list. Signed-off-by: Joe Stringer <joe@cilium.io> Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
[ upstream commit acba9d1 ] [ upstream commit 622d841 ] Pull this commit from the v1.10 branch used during that release, and re-generate the authors file based on it. Signed-off-by: Joe Stringer <joe@cilium.io> Authors updated with `make update-authors`. Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
[ upstream commit 6d128d2 ] Bokang Li informed me out-of-band that this is the correct representation of their name, fix it up. Yurii Komar has their name on their github profile. Signed-off-by: Joe Stringer <joe@cilium.io> Authors updated with `make update-authors`, but no changes. Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
[ upstream commit 519fa82 ] A few users have been asking about where to find the numeric IDs associated with a given identity, so maybe it's worth adding them to the table. Signed-off-by: Bruno Miguel Custódio <brunomcustodio@gmail.com> Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
[ upstream commit 8a2d2d3 ] This bash function is super close to being generically useful across different repositories, by allowing to check whether a commit is in any particular upstream (including hubble repos). Make it a bit more generic without changing the default args, that way we don't have to update any of the existing scripts. Signed-off-by: Joe Stringer <joe@cilium.io> Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
nbusseneau
force-pushed
the
pr/v1.8-backport-2021-05-21
branch
from
97ebbd7
to
df1d860
Compare
|
Rebased on latest |
|
test-backport-1.8 |
|
All Jenkins tests successful following fixes. |
joestringer
approved these changes
Jun 2, 2021
nbusseneau
added
the
ready-to-merge
aanm
approved these changes
Jun 3, 2021
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.
Once this PR is merged, you can update the PR labels via: