Skip to content

Conversation

jrajahalme
Copy link
Member

@jrajahalme jrajahalme commented Mar 19, 2021

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

$ for pr in 14488 14568 15328 15323 15365 15363; do contrib/backporting/set-labels.py $pr done 1.8; done

youssefazrak and others added 4 commits March 19, 2021 16:17
[ upstream commit 9a058d6 ]

When using the Bugtool with "direct routing / native routing mode" enabled, we
are only getting the encryption and proxy tables (200 / 2005).

The goal of this PR is to get the route tables dynamically and remove the
hardcoded ones.

Fixes: #12250

Signed-off-by: Youssef Azrak yazrak.tech@gmail.com
Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
[ upstream commit 84061d1 ]

To assist with additional debugging around processor affinity, we are
adding the Taskset command to the bugtool.

Fixes: #14566

Signed-off-by: Youssef Azrak <yazrak.tech@gmail.com>
Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
[ upstream commit 390ee46 ]

Before this patch, get_user_remote() would ignore its remote argument
when provided and always take the auto-detection path.

Signed-off-by: Alexandre Perrin <alex@kaworu.ch>
Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
[ upstream commit ab4bafc ]

Signed-off-by: Sean Winn <sean@isovalent.com>
Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
@jrajahalme jrajahalme added kind/backports This PR provides functionality previously merged into master. backport/1.8 labels Mar 19, 2021
@jrajahalme jrajahalme requested a review from a team as a code owner March 19, 2021 16:20
@jrajahalme
Copy link
Member Author

test-backport-1.8

@jrajahalme
Copy link
Member Author

Fails on kernel 4.9 due to complexity issue:

2021-03-19T18:13:41.312406578Z level=warning msg="BPF program is too large. Proccessed 98305 insn" subsys=datapath-loader

@jrajahalme
Copy link
Member Author

Fails on kernel 4.9 due to complexity issue:

2021-03-19T18:13:41.312406578Z level=warning msg="BPF program is too large. Proccessed 98305 insn" subsys=datapath-loader

#15321 seems to be the culprit here, conversation there indicated the same issue on master?

@jrajahalme jrajahalme added the kind/complexity-issue Relates to BPF complexity or program size issues label Mar 19, 2021
@aditighag
Copy link
Member

Fails on kernel 4.9 due to complexity issue:

2021-03-19T18:13:41.312406578Z level=warning msg="BPF program is too large. Proccessed 98305 insn" subsys=datapath-loader

#15321 seems to be the culprit here, conversation there indicated the same issue on master?

Umm... I thought the complexity was resolved with one of my commits. The 4.9 test passed on the master branch. @pchaigno Did you hit this issue on your temporary backport PR?

@pchaigno
Copy link
Member

@pchaigno Did you hit this issue on your temporary backport PR?

Yes, even with the unlikely().

@aditighag
Copy link
Member

@jrajahalme Please skip the PR in question. Paul and I will manage the 1.8 backport.

mauriciovasquezbernal and others added 2 commits March 19, 2021 15:12
[ upstream commit 458c623 ]

"kubectl get secret -n kube-system cilium-ipsec-keys" outputs two lines
with "keys:", one is the real key data and other is a "managedField":

$ kubectl get secret -n kube-system cilium-ipsec-keys -o yaml | grep keys:
  keys: MyByZmM0MTA2KGdjbShhZXMpKSA3ZTE1YmZlNmQyZjczNGUzZmQ0YTEzM2FlZDU2MGQwMjEzZjBjNmRmIDEyOA==
        f:keys: {}

It makes the whole command to get the key id to fail:

$ KEYID=$(kubectl get secret -n kube-system cilium-ipsec-keys -o yaml|grep keys: | awk '{print $2}' | base64 -d | awk '{print $1}')
base64: invalid input

This will be fixed in next Kubernetes release
(kubernetes/kubernetes#96878), in the meanwhile
just use a regular expression in awk to match "keys:" at the begining.

Fixes: 4ea52ae ("cilium: encryption, docs key updates")

Signed-off-by: Mauricio Vásquez <mauricio@accuknox.com>
Signed-off-by: Mauricio Vásquez <mauricio@kinvolk.io>
Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
[ upstream commit 9020c65 ]

Fixes : #15270

Signed-off-by: Gaurav Genani <h3llix.pvt@gmail.com>
Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
@jrajahalme jrajahalme force-pushed the pr/v1.8-backport-2021-03-19 branch from a5e1c28 to c6d82bb Compare March 19, 2021 22:12
@jrajahalme
Copy link
Member Author

Removed backport of #15321

@jrajahalme
Copy link
Member Author

test-backport-1.8

@pchaigno pchaigno removed the kind/complexity-issue Relates to BPF complexity or program size issues label Mar 20, 2021
@jrajahalme
Copy link
Member Author

retest-upstream-k8s

@jrajahalme
Copy link
Member Author

Upstream k8s test had failed to bring vagrant vm up, retesting.

Copy link
Member

@kaworu kaworu left a comment

Choose a reason for hiding this comment

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

Look good for my change, thanks!

@jrajahalme jrajahalme added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Mar 22, 2021
@joestringer joestringer merged commit 1b0b9ac into v1.8 Mar 22, 2021
@joestringer joestringer deleted the pr/v1.8-backport-2021-03-19 branch March 22, 2021 23:43
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.

9 participants