From a14080153f066ae266b622e1fb6f4e87f23d844a Mon Sep 17 00:00:00 2001 From: "kumahq[bot]" <110050114+kumahq[bot]@users.noreply.github.com> Date: Tue, 17 Dec 2024 10:25:16 +0000 Subject: [PATCH] chore(mk): fix k3d start errors when using calico CNI (backport of #12291) (#12298) Automatic cherry-pick of #12291 for branch release-2.6 Generated by [action](https://github.com/kumahq/kuma/actions/runs/12370724944) cherry-picked commit fda33720fd8008fbf0a505caa3c70c2da67f22a4 Signed-off-by: Jay Chen <1180092+jijiechen@users.noreply.github.com> Co-authored-by: Jay Jijie Chen <1180092+jijiechen@users.noreply.github.com> --- mk/k3d.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/k3d.mk b/mk/k3d.mk index d5ce9b0ebbe6..3be6e2e6171d 100644 --- a/mk/k3d.mk +++ b/mk/k3d.mk @@ -106,7 +106,7 @@ k3d/cleanup-docker-credentials: @rm -f /tmp/.kuma-dev/k3d-registry.yaml .PHONY: k3d/start -k3d/start: ${KIND_KUBECONFIG_DIR} k3d/network/create k3d/setup-docker-credentials +k3d/start: ${KIND_KUBECONFIG_DIR} k3d/network/create k3d/setup-docker-credentials \ $(if $(findstring calico,$(K3D_NETWORK_CNI)),$(TOP)/$(KUMA_DIR)/test/k3d/calico.$(K3D_VERSION).yaml) @echo "PORT_PREFIX=$(PORT_PREFIX)" @KUBECONFIG=$(KIND_KUBECONFIG) \