v1.7 backport for #11333 #11414
Merged
v1.7 backport for #11333 #11414
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
joestringer
added
backport/1.7
kind/backports
|
never-tell-me-the-odds |
|
Hit known flake #10442. |
joestringer
added
the
dont-merge/blocked
|
I'll hold off on rebasing this until #11233 goes in to minimize the conflicts there. |
joestringer
force-pushed
the
pr/v1.7-backport-2020-05-07
branch
from
11a5407
to
e0dcf30
Compare
joestringer
removed
the
dont-merge/blocked
|
never-tell-me-the-odds |
gandro
approved these changes
May 12, 2020
|
restart-ginkgo |
1 similar comment
|
restart-ginkgo |
maintainer-s-little-helper
bot
added
the
ready-to-merge
gandro
added
dont-merge/needs-rebase
maintainer-s-little-helper
bot
added
the
ready-to-merge
[ upstream commit 3689e42 ] Make use of Context to share more test preparation for the CIDR tests, and allow the toCIDR / fromCIDR tests to be split out to validate them separately. Signed-off-by: Joe Stringer <joe@cilium.io>
[ upstream commit ba9b781 ] This docker network will be used by upcoming CIDR policy tests, so share it in the common helpers package. Signed-off-by: Joe Stringer <joe@cilium.io>
[ upstream commit bf47589 ] Previously, we only tested that CIDR policy does not unintentionally open up connectivity to containers that reside within the CIDR range. This test now actually validates that the "fromCIDR" policy applies to traffic from outside Cilium's control, assuming it resides within the IP range allowed by the policy. Signed-off-by: Joe Stringer <joe@cilium.io>
[ upstream commit baf10f8 ] Signed-off-by: Joe Stringer <joe@cilium.io>
[ upstream commit bad730c ] Backporter's notes: Had to rebase against refactored functions resolve_srcid_ipv[46]() and fix up bpf.sha. Signed-off-by: Will Deuschle <wdeuschle@palantir.com> Signed-off-by: Joe Stringer <joe@cilium.io>
joestringer
force-pushed
the
pr/v1.7-backport-2020-05-07
branch
from
e0dcf30
to
95b289e
Compare
|
never-tell-me-the-odds |
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.
resolve_srcid_ipv[46]()refactoring in master (not present in v1.7).Once this PR is merged, you can update the PR labels via:
Currently I backported this including all test changes, but if we hit issues because the required test code is not available I'll just drop them and rework this to only include the functional fix.