-
Notifications
You must be signed in to change notification settings - Fork 3.4k
v1.8 backports 2021-03-19 #15400
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 2021-03-19 #15400
Conversation
[ 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 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>
test-backport-1.8 |
Fails on kernel 4.9 due to complexity issue:
|
#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 |
Yes, even with the |
@jrajahalme Please skip the PR in question. Paul and I will manage the |
[ 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>
a5e1c28
to
c6d82bb
Compare
Removed backport of #15321 |
test-backport-1.8 |
retest-upstream-k8s |
Upstream k8s test had failed to bring vagrant vm up, retesting. |
There was a problem hiding this 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!
Once this PR is merged, you can update the PR labels via: