backports to 1.1 2018-08-28 #5405
Closed
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 b88691f ] Prometheus and grafana are commonly deployed in the monitoring ns the change makes it easy to connect those services without requiring a full domain name for service Signed-off-by: Arvind Soni <arvindsoni@gmail.com> Signed-off-by: Maciej Kwiek <maciej.iai@gmail.com>
[ upstream commit a8e1512 ] Include the map name here, so that the caller doesn't need to. Related: cilium#5089 Signed-off-by: Joe Stringer <joe@covalent.io> Signed-off-by: Maciej Kwiek <maciej.iai@gmail.com>
[ upstream commit a0fbf0a ] Previously, the `errors` variable that would be returned was always initialized to a non-nil empty slice, which would ensure that if the caller checked it against nil that it would appear to always fail, leading to the following false positive warning message: unable to delete element 7439 from map /sys/fs/bpf/tc/globals/cilium_policy_7439: [] Fixes: cilium#5089 Signed-off-by: Joe Stringer <joe@covalent.io> Signed-off-by: Maciej Kwiek <maciej.iai@gmail.com>
…g endpoints [ upstream commit a6d3a5d ] Fixes: cilium#5290 Signed-off-by: Thomas Graf <thomas@cilium.io> Signed-off-by: Maciej Kwiek <maciej.iai@gmail.com>
[ upstream commit 50f29e9 ] Signed-off-by: André Martins <andre@cilium.io> Signed-off-by: Maciej Kwiek <maciej.iai@gmail.com>
[ upstream commit dd19c96 ] Signed-off-by: Maciej Kwiek <maciej@covalent.io> Signed-off-by: Maciej Kwiek <maciej.iai@gmail.com>
[ upstream commit bd42cec ] Fixes: cilium#5317 Signed-off-by: Romain Lenglet <romain@covalent.io> Signed-off-by: Maciej Kwiek <maciej.iai@gmail.com>
[ upstream commit d8314c7 ] Create new listeners and remove obsolete listeners as early as possible, just after updating the policy map. This gives more time to Envoy to configure and ACK listener config updates, and reduces the probability of regeneration timeouts due to Envoy. Also remove one endpoint mutex locking section after BPF compilation, in order to reduce the regeneration time. Signed-off-by: Romain Lenglet <romain@covalent.io> Signed-off-by: Maciej Kwiek <maciej.iai@gmail.com>
[ upstream commit 460c376 ] The Go docs specify that a time.Duration "represents the elapsed time between two instants as an int64 nanosecond count." However, TimeoutConfig's Ticker and Timeout fields violated that semantics as they were defined as time.Duration while storing durations in Seconds. Fix the timeout handling in WaitForServiceEndpoints, which converted timeouts into billions of seconds. To prevent such bugs from occurring again, specify clearly that Ticker and Timeout contain seconds, and change their type to int64. Signed-off-by: Romain Lenglet <romain@covalent.io> Signed-off-by: Maciej Kwiek <maciej.iai@gmail.com>
|
test-me-please |
|
test-me-please |
rlenglet
approved these changes
Aug 30, 2018
rlenglet
suggested changes
Aug 30, 2018
| @@ -712,6 +712,20 @@ func (e *Endpoint) regenerateBPF(owner Owner, epdir, reason string) (uint64, boo | |||
| } | |||
| } | |||
|
|
|||
| // Walk the L4Policy to add new redirects and update the desired policy map | |||
There was a problem hiding this comment.
The changes to this file look suspicious. I would revert just those.
There was a problem hiding this comment.
OK I'll drop the patch then.
ea5ec53
There was a problem hiding this comment.
Yes, that's the one. Thanks!
rlenglet
approved these changes
Aug 31, 2018
|
New PR created here, #5443 |
|
Closing in favor of #5443 |
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.
#5300
#5284
#5252
#5250
#5230
#5206
This change is