v1.7 backports 2021-03-19 #15401
Merged
v1.7 backports 2021-03-19 #15401
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 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 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 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>
jrajahalme
added
kind/backports
|
test-backport-1.7 |
jrajahalme
added
the
ready-to-merge
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.
Once this PR is merged, you can update the PR labels via: