Skip to content

Commit

Permalink
chore(mk): fix make kind/start (#8977)
Browse files Browse the repository at this point in the history
Fix `kind create cluster --config` argument value to refer to existing cluster.yaml file.

Signed-off-by: Philipp Rudloff <[email protected]>
  • Loading branch information
Philipp Rudloff authored Jan 23, 2024
1 parent a7c29d9 commit 184a736
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions mk/kind.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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.yaml
KIND_CONFIG ?= $(KUMA_DIR)/test/kind/cluster-ipv6-$(KIND_CLUSTER_NAME)-1.yaml
else
KIND_CONFIG ?= $(KUMA_DIR)/test/kind/cluster.yaml
KIND_CONFIG ?= $(KUMA_DIR)/test/kind/cluster-$(KIND_CLUSTER_NAME)-1.yaml
endif

ifeq ($(KUMACTL_INSTALL_USE_LOCAL_IMAGES),true)
Expand All @@ -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 "$(KUMA_DIR)/test/kind/cluster-$(if $(IPV6),ipv6-,)$(KIND_CLUSTER_NAME).yaml" \
--config "$(KIND_CONFIG)" \
--image=kindest/node:$(CI_KUBERNETES_VERSION) \
--kubeconfig $(KIND_KUBECONFIG) \
--quiet --wait 120s && \
Expand Down

0 comments on commit 184a736

Please sign in to comment.