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.

Sign up for GitHub

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

Jump to bottom

v1.7 backports 2020-04-01 #10818

Merged
merged 10 commits into from
Apr 2, 2020
Merged

v1.7 backports 2020-04-01 #10818

merged 10 commits into from
Apr 2, 2020

Commits on Apr 2, 2020

  1. bpf: significantly improve capacity of TCP CT tables 

    [ upstream commit 424ea70 ]

[ Backporter's notes: Had to rebase against skb -> ctx translation, and
  include/bpf/api.h -> include/bpf/helpers.h move. ]

ct_create{4,6}() inserts related entries into the TCP CT tables given
the map is usually in the form of ct_create4(get_ct_map4(&tuple)) or
ct_create6(get_ct_map6(&tuple)). Similarly, the lookup parts are in
form of ct_lookup4(get_ct_map4(&tuple)) or ct_lookup6(get_ct_map6(&tuple)).

However, the tuples' nexthdr usually points to the one in the packet.
This means, we can /never/ find a related entry since it sits in the TCP
CT tables, but their lookup is always in the ANY table instead.

Fix the insertions by adding to the CT_MAP_ANY{4,6} tables and by that
implicityly double the capacity of TCP CT tables.

Go even beyond that by not creating related entries for CT_SERVICE entries.

It does not make sense to create CT_SERVICE entries with related flag
since we don't translate ICMP there anyway. Save overhead and don't add
them to the maps (same for NodePort/NAT related ones).

Fixes: 750b3f9 ("bpf: Split connection tracking for TCP and non-TCP")
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Joe Stringer <joe@cilium.io>
    @borkmann @joestringer
    borkmann authored and joestringer committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    c4b447c View commit details
    Browse the repository at this point in the history

  2. Fix incorrect name in sysctl_linux_test.go 

    [ upstream commit d933cfe ]

Signed-off-by: Chris Tarazi <chris@isovalent.com>
Signed-off-by: Joe Stringer <joe@cilium.io>
    @christarazi @joestringer
    christarazi authored and joestringer committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    b003145 View commit details
    Browse the repository at this point in the history

  3. k8s: Defer marking node as ready to just API is served 

    [ upstream commit 948659f ]

[ Backporter's notes: Had to add 'context' to the imports ]

The Kubernetes node was marked as ready after the daemon was finished
initializing. There were still several operations that could fail after
that point which could lead to a situation in which a node was marked
ready while the Cilium agent then later errored out, leading to a ready
but failing node.

Move the marking of the node readiness to the very end of the
bootstrapping.

Fixes: #10762

Signed-off-by: Thomas Graf <thomas@cilium.io>
Signed-off-by: Joe Stringer <joe@cilium.io>
    @tgraf @joestringer
    tgraf authored and joestringer committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    202ce4b View commit details
    Browse the repository at this point in the history

  4. pkg/allocator: do not fail to allocate identity in CRD mode 

    [ upstream commit 912eb46 ]

In case 2 allocations with the same key are being allocated at the
same time one of them might retrieve the ID while the other will
try to allocate the ID in the CRD store. The issue occurs when the
localKeys map will ignore the 2nd key allocation since it won't accept 2
IDs for the same key. Having this failure might cause endpoints from
being restored in CRD mode.

Signed-off-by: André Martins <andre@cilium.io>
Signed-off-by: Joe Stringer <joe@cilium.io>
    @aanm @joestringer
    aanm authored and joestringer committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    44b3e80 View commit details
    Browse the repository at this point in the history

  5. Add helm NOTES file 

    [ upstream commit 94dcaa7 ]

This patch adds helm NOTES.txt file to the respective template folders.

Fixes: #10070
Signed-off-by: Swaminathan Vasudevan <svasudevan@suse.com>
Signed-off-by: Joe Stringer <joe@cilium.io>
    @soumynathan @joestringer
    soumynathan authored and joestringer committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    f88a012 View commit details
    Browse the repository at this point in the history

  6. kubernetes/connectivity-check: Add timeoutSeconds to deployment as well 

    [ upstream commit 4459e83 ]

Fixes: 0bbb6c2 ("set explicit livenessProbe and readinessProbe timeout for connectivity checks that expect an L3 deny")

Signed-off-by: Thomas Graf <thomas@cilium.io>
Signed-off-by: Joe Stringer <joe@cilium.io>
    @tgraf @joestringer
    tgraf authored and joestringer committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    40c5e51 View commit details
    Browse the repository at this point in the history

  7. kubernetes/connectivity-check: Whitelist OpenShift DNS 

    [ upstream commit 2069570 ]

OpenShift DNS is using non-standard labels and non-standard namespace.

Signed-off-by: Thomas Graf <thomas@cilium.io>
Signed-off-by: Joe Stringer <joe@cilium.io>
    @tgraf @joestringer
    tgraf authored and joestringer committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    957ab0f View commit details
    Browse the repository at this point in the history

  8. kubernetes/connectivity-check: Add --fail to all curl commands 

    [ upstream commit 09eebce ]

Make sure to always return an error code on failue.

Signed-off-by: Thomas Graf <thomas@cilium.io>
Signed-off-by: Joe Stringer <joe@cilium.io>
    @tgraf @joestringer
    tgraf authored and joestringer committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    8dcbb3d View commit details
    Browse the repository at this point in the history

  9. cilium, contrib: tighten permissions on systemd bpffs mount unit file 

    [ upstream commit 95529fb ]

Given bpf fs wasn't mounted before, then mount it with stricter
permissions than the default ones (777). Also add few other options
as discussed in #10793 such as `nosuid,nodev,noexec` though at least
from bpf fs side these are ignored.

Fixes: #10793
Reported-by: Travis Glenn Hansen <travisghansen@yahoo.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Joe Stringer <joe@cilium.io>
    @borkmann @joestringer
    borkmann authored and joestringer committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    2aa4561 View commit details
    Browse the repository at this point in the history

  10. pkg/k8s: fix heartbeat unit test 

    [ upstream commit 26dec4c ]

Fix unit test logic for the heartbeat function mock. In some test cases
this function should block until the test is finished so some of those
tests were re-written to take this into account.

Signed-off-by: André Martins <andre@cilium.io>
Signed-off-by: Joe Stringer <joe@cilium.io>
    @aanm @joestringer
    aanm authored and joestringer committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    6c5c3c8 View commit details
    Browse the repository at this point in the history