Skip to content

Commit

Permalink
chore(mk): fix k3d start errors when using calico CNI (backport of #1…
Browse files Browse the repository at this point in the history
…2291) (#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 fda3372

Signed-off-by: Jay Chen <[email protected]>
Co-authored-by: Jay Jijie Chen <[email protected]>
  • Loading branch information
kumahq[bot] and jijiechen authored Dec 17, 2024
1 parent 2a6e768 commit a140801
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mk/k3d.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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) \
Expand Down

0 comments on commit a140801

Please sign in to comment.