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.

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

v1.9 backports 2020-10-19 #13624

Merged
merged 4 commits into from
Oct 21, 2020
Merged

v1.9 backports 2020-10-19 #13624

merged 4 commits into from
Oct 21, 2020

Conversation

rolinh
Copy link
Member

@rolinh rolinh commented Oct 19, 2020

Once this PR is merged, you can update the PR labels via:

$ for pr in 13613 13244 13664; do contrib/backporting/set-labels.py $pr done 1.9; done

[ upstream commit 163a7c5 ]

Clean it up a bit, in particular, here is no need to add a ipv6_context
parameter since this can be inferred from ctx vs ctx_full already as we
pass a fake ctx for v4-in-v6.

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Robin Hahling <robin.hahling@gw-computing.net>
@rolinh rolinh added kind/backports This PR provides functionality previously merged into master. backport/1.9 labels Oct 19, 2020
@rolinh rolinh requested a review from a team as a code owner October 19, 2020 14:10
@rolinh rolinh requested a review from borkmann October 19, 2020 15:09
@aanm aanm requested a review from brb October 19, 2020 16:42
Copy link
Member

@brb brb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM for #13244.

Copy link
Member

@brb brb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM for #13244.

@rolinh rolinh force-pushed the pr/v1.9-backport-2020-10-19 branch from 48d48a5 to a88cb34 Compare October 21, 2020 08:37
[ 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: Robin Hahling <robin.hahling@gw-computing.net>
[ upstream commit 682f682 ]

Gets rid of ToNetwork() in DumpParser().

Signed-off-by: Jianlin Lv <Jianlin.Lv@arm.com>
Signed-off-by: Robin Hahling <robin.hahling@gw-computing.net>
[ upstream commit 17fd953 ]

This commit is to add two additional flag `image.tag=latest` and
`operator.image.tag=latest` in smoketest. These two docker images are
built and loaded into cluster as part of smoke test with tag as latest.
Additionally, there are pullPolicy as Never to make sure that these
images will be used for testing.

Setting `image.tag=latest` and `operator.image.tag=latest` will make
sure that smoke test will work for master and any release branch v1.9.x

Signed-off-by: Tam Mach <sayboras@yahoo.com>
Signed-off-by: Robin Hahling <robin.hahling@gw-computing.net>
@rolinh rolinh requested a review from sayboras October 21, 2020 11:28
Copy link
Member

@sayboras sayboras left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good for my changes 👍

@rolinh
Copy link
Member Author

rolinh commented Oct 21, 2020

test-backport-1.9

1 similar comment
@nebril
Copy link
Member

nebril commented Oct 21, 2020

test-backport-1.9

@rolinh rolinh added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Oct 21, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot removed the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Oct 21, 2020
@joestringer joestringer merged commit fae41ee into v1.9 Oct 21, 2020
@joestringer joestringer deleted the pr/v1.9-backport-2020-10-19 branch October 21, 2020 20:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants