[ 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>

[ upstream commit 9020c65 ]

Fixes : #15270

Signed-off-by: Gaurav Genani <h3llix.pvt@gmail.com>
Signed-off-by: Jarno Rajahalme <jarno@covalent.io>