v1.7 backports 2020-10-23 #13721
Merged
v1.7 backports 2020-10-23 #13721
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 9673c48 ] Identity allocation uses cache and refcnt mechanisms, if the identity info is already in remote kvstore and localkeys store, it will just increase the refcnt, then notify the caller that this identity is reused. The caller will then not bump up the identity counter. However, there is a corner case that not get handled: refcnt from 0 to 1, which will result to negative identity count in the metrics output. This patch fixes the problem by returning another flag to indicate whether the identity is first-time referenced (refcnt from 0 to 1) or not. The caller then uses this information to determine whether or not to increase the counter. Signed-off-by: arthurchiao <arthurchiao@hotmail.com> Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
[ upstream commit c5b709b ] The port/RevNat info is stored in the bpf map in network byte order; When displaying the given lbmap content, the port needs to be converted to host byte order. Add ToHost() function for lbmap ToHost converts fields to host byte order. Signed-off-by: Jianlin Lv <Jianlin.Lv@arm.com> Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
[ upstream commit 682f682 ] Gets rid of ToNetwork() in DumpParser(). Signed-off-by: Jianlin Lv <Jianlin.Lv@arm.com> Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
[ upstream commit 5733f6a ] This change is only adding more unit tests to better understand the behavior of the labelsfilter as well as improving the documentation for the expectation of filtering labels. Signed-off-by: André Martins <andre@cilium.io> Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
gandro
added
backport/1.7
kind/backports
|
test-backport-1.7 |
|
Provisioning error on https://jenkins.cilium.io/job/Cilium-PR-Ginkgo-Tests-K8s/3658/ |
|
test-backport-1.7 |
aanm
approved these changes
Oct 23, 2020
joestringer
approved these changes
Oct 23, 2020
maintainer-s-little-helper
bot
added
the
ready-to-merge
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:
Each commit had some conflicts. They all seemed rather simple, but it would be good if I get an additional set of eyes on this:
commit 9673c48
Rather trivial merge conflict where v1.7 used
errors.Wrapfinstead offmt.Errorf.commit c5b709b
Simple multiple merge conflicts in the
String()functions, as v1.7 seemedto use
fmt.Sprintfinstead ofnet.JoinHostPort.I skipped the the changes to the
pkg/maps/lbmap/affinity.gofile,which does not seem to exist in the v1.7 branch.
commit 682f682
Simple merge conflict in
String()due toloadbalancer.ScopeInternalcheck which is not present in
v1.7Skipped the changes to functions related affinity map dumping in
pkg/maps/lbmap/lbmap.go. They do not seem present in v1.7.Skipped changes to
pkg/maps/lbmap/source_range.goand
pkg/maps/lbmap/affinity.go, neither of which ar present in v1.7.commit 5733f6a
Simple removal of the
labels.references inpkg/labels/filter_test.godue to this file being partof the
labelspackage instead thelabelsfilterspackage in v1.7.