From 6f6e380ae2e54620723fc631c4a4caf4c7a0d202 Mon Sep 17 00:00:00 2001 From: Mike Beaumont Date: Wed, 24 Jan 2024 14:20:39 +0100 Subject: [PATCH] Revert "chore(mk): fix make kind/start (#8977)" (#9020) This reverts commit 184a7366ffb0f86389bbeceb24573eea6f2778d9 which broke CI on branches. We'll solve whatever #8676 broke separately. Signed-off-by: Mike Beaumont --- mk/kind.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mk/kind.mk b/mk/kind.mk index 378189ee8b50..d8d1fd200121 100644 --- a/mk/kind.mk +++ b/mk/kind.mk @@ -11,9 +11,9 @@ KIND_KUBECONFIG := $(KIND_KUBECONFIG_DIR)/kind-$(KIND_CLUSTER_NAME)-config unexport KUBECONFIG ifdef IPV6 -KIND_CONFIG ?= $(KUMA_DIR)/test/kind/cluster-ipv6-$(KIND_CLUSTER_NAME)-1.yaml +KIND_CONFIG ?= $(KUMA_DIR)/test/kind/cluster-ipv6.yaml else -KIND_CONFIG ?= $(KUMA_DIR)/test/kind/cluster-$(KIND_CLUSTER_NAME)-1.yaml +KIND_CONFIG ?= $(KUMA_DIR)/test/kind/cluster.yaml endif ifeq ($(KUMACTL_INSTALL_USE_LOCAL_IMAGES),true) @@ -32,7 +32,7 @@ kind/start: ${KUBECONFIG_DIR} $(KIND) get clusters | grep $(KIND_CLUSTER_NAME) >/dev/null 2>&1 && echo "Kind cluster already running." && exit 0 || \ ($(KIND) create cluster \ --name "$(KIND_CLUSTER_NAME)" \ - --config "$(KIND_CONFIG)" \ + --config "$(KUMA_DIR)/test/kind/cluster-$(if $(IPV6),ipv6-,)$(KIND_CLUSTER_NAME).yaml" \ --image=kindest/node:$(CI_KUBERNETES_VERSION) \ --kubeconfig $(KIND_KUBECONFIG) \ --quiet --wait 120s && \