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.8 backports 2020-10-19 #13628

Merged
merged 2 commits into from
Oct 20, 2020
Merged

v1.8 backports 2020-10-19 #13628

merged 2 commits into from
Oct 20, 2020

Conversation

rolinh
Copy link
Member

@rolinh rolinh commented Oct 19, 2020

Skipped due to conflicts:

EDIT: I removed the following PR as it was found (thanks @aanm) that it introduces a regression that leads to a deadlock situation when some endpoints are being deleted on restore. cc @christarazi

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

$ for pr in 13596 13591; do contrib/backporting/set-labels.py $pr done 1.8; done

@rolinh rolinh added kind/backports This PR provides functionality previously merged into master. backport/1.8 labels Oct 19, 2020
@rolinh rolinh requested a review from a team October 19, 2020 15:07
@rolinh rolinh requested review from a team as code owners October 19, 2020 15:07
@rolinh rolinh requested a review from a team October 19, 2020 15:07
@rolinh rolinh requested review from a team as code owners October 19, 2020 15:07
@rolinh rolinh requested a review from a team October 19, 2020 15:07
@rolinh rolinh requested a review from a team as a code owner October 19, 2020 15:07
@rolinh rolinh requested review from a team October 19, 2020 15:07
@rolinh rolinh requested review from a team as code owners October 19, 2020 15:07
@rolinh rolinh requested a review from a team October 19, 2020 15:07
@rolinh rolinh requested a review from a team as a code owner October 19, 2020 15:07
@rolinh rolinh requested a review from a team October 19, 2020 15:07
@rolinh rolinh requested review from a team as code owners October 19, 2020 15:07
@rolinh rolinh requested a review from a team October 19, 2020 15:07
@rolinh rolinh requested review from a team as code owners October 19, 2020 15:07
@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Oct 19, 2020
@rolinh rolinh changed the base branch from master to v1.8 October 19, 2020 15:07
@rolinh rolinh removed request for a team October 19, 2020 15:08
@rolinh rolinh removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Oct 19, 2020
Copy link
Member

@pchaigno pchaigno left a comment

Choose a reason for hiding this comment

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

My changes look good 👍

I'll take care of backporting #13383.

@rolinh
Copy link
Member Author

rolinh commented Oct 19, 2020

test-backport-1.8

@rolinh
Copy link
Member Author

rolinh commented Oct 20, 2020

retest-4.19

kkourt and others added 2 commits October 20, 2020 17:05
[ upstream commit ee7e681 ]

Renamed the scripts repo to `cilium-perf-networking.git` to make it
more clear and less annoying for people that have to check it out.

While we are at it, add a note about the terraform version that we
expect.

Signed-off-by: Kornilios Kourtis <kornilios@isovalent.com>
Signed-off-by: Robin Hahling <robin.hahling@gw-computing.net>
[ upstream commit 2e0539a ]

When running Cilium with the devices set, but neither kube-proxy-free or
the host firewall enabled, cilium-agent will attempt to remove the
previous BPF program from the native devices' egress tc hook. If no
program is attached there (i.e., Cilium was running without host
firewall and kube-proxy replacement before restarting), the removal will
fail with the following error.

    level=error msg="Command execution failed" cmd="[tc filter delete dev enp0s8 egress]" error="exit status 2" subsys=datapath-loader
    level=warning msg="Error: Parent Qdisc doesn't exists." subsys=datapath-loader
    level=warning msg="We have an error talking to the kernel, -1" subsys=datapath-loader

This commit fixes this error by first checking that the device has a BPF
program attached on egress.

I tested this in the dev. VM, by first starting Cilium with our
kube-proxy-replacement, then without but keeping the devices
configuration.

Fixes: a695f53 ("Endpoint for host")
Signed-off-by: Paul Chaignon <paul@cilium.io>
Signed-off-by: Robin Hahling <robin.hahling@gw-computing.net>
@rolinh rolinh force-pushed the pr/v1.8-backport-2020-10-19 branch from f726fed to 5d4741e Compare October 20, 2020 15:05
@rolinh
Copy link
Member Author

rolinh commented Oct 20, 2020

test-backport-1.8

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Oct 20, 2020
@aanm aanm merged commit 5b0bac4 into v1.8 Oct 20, 2020
@aanm aanm deleted the pr/v1.8-backport-2020-10-19 branch October 20, 2020 19:39
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. ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants