From 68acf8a72472cdfeb0b0298fd51245a0b9b8b961 Mon Sep 17 00:00:00 2001 From: weizhoublue <45163302+weizhoublue@users.noreply.github.com> Date: Wed, 30 Oct 2024 16:28:41 +0800 Subject: [PATCH] Merge pull request #4234 from ty-dc/fix/calico-update e2e fix: the latest version of calico cannot find the felixconfigurations resource Signed-off-by: robot --- test/scripts/install-default-cni.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/scripts/install-default-cni.sh b/test/scripts/install-default-cni.sh index 35f7ad0e18..c776853dc2 100755 --- a/test/scripts/install-default-cni.sh +++ b/test/scripts/install-default-cni.sh @@ -134,7 +134,8 @@ function install_calico() { echo "the value of E2E_IP_FAMILY: ipv4 or ipv6 or dual" exit 1 esac - kubectl patch felixconfigurations.crd.projectcalico.org default --type='merge' -p '{"spec":{"chainInsertMode":"Append"}}' || { echo "failed to patch calico chainInsertMode"; exit 1; } + # there no default felixconfigurations.crd.projectcalico.org in latest calico version (https://github.com/projectcalico/calico/releases/tag/v3.29.0) + kubectl patch felixconfigurations.crd.projectcalico.org default --type='merge' -p '{"spec":{"chainInsertMode":"Append"}}' || true # restart calico pod kubectl -n kube-system delete pod -l k8s-app=calico-node --force --grace-period=0 && sleep 3