From 3e3b6dafd673a489e4c3f2b8ab755ebcf1ad17a0 Mon Sep 17 00:00:00 2001 From: Sebastian Sch Date: Thu, 1 Feb 2024 22:45:08 +0200 Subject: [PATCH] add w/a for multus bug in CI Signed-off-by: Sebastian Sch --- hack/run-e2e-conformance-virtual-cluster.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hack/run-e2e-conformance-virtual-cluster.sh b/hack/run-e2e-conformance-virtual-cluster.sh index 5d78f7a8ce..03e36c11a9 100755 --- a/hack/run-e2e-conformance-virtual-cluster.sh +++ b/hack/run-e2e-conformance-virtual-cluster.sh @@ -320,7 +320,11 @@ if [ $(ip a | grep 10.85.0 | wc -l) -eq 0 ]; then ip link del cni0; fi EOF -kubectl -n kube-system get po | grep multus | awk '{print "kubectl -n kube-system delete po",$1}' | sh +# remove the patch and return this line after multus bug is fixed +# https://github.com/k8snetworkplumbingwg/multus-cni/issues/1221 +#kubectl -n kube-system get po | grep multus | awk '{print "kubectl -n kube-system delete po",$1}' | sh +kubectl patch -n kube-system ds/kube-multus-ds --type=json -p='[{"op": "replace", "path": "/spec/template/spec/initContainers/0/command", "value":["cp", "-f","/usr/src/multus-cni/bin/multus-shim", "/host/opt/cni/bin/multus-shim"]}]' + kubectl -n kube-system get po | grep coredns | awk '{print "kubectl -n kube-system delete po",$1}' | sh TIMEOUT=400