From 3bf01df8d8ae2cc63ed8e47ae5db859cad278fef Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Wed, 9 Feb 2022 14:43:06 -0700 Subject: [PATCH] Work around lack of kubebuilder-tools for darwin/arm64 --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9088ae632180..6970a51d4bd4 100644 --- a/Makefile +++ b/Makefile @@ -435,7 +435,11 @@ e2e-framework: ## Builds the CAPI e2e framework ARTIFACTS ?= ${ROOT_DIR}/_artifacts -KUBEBUILDER_ASSETS ?= $(shell $(SETUP_ENVTEST) use --use-env -p path $(KUBEBUILDER_ENVTEST_KUBERNETES_VERSION)) +ifeq ($(shell go env GOOS),darwin) # Use the darwin/amd64 binary until an arm64 version is available + KUBEBUILDER_ASSETS ?= $(shell $(SETUP_ENVTEST) use --use-env -p path --arch amd64 $(KUBEBUILDER_ENVTEST_KUBERNETES_VERSION)) +else + KUBEBUILDER_ASSETS ?= $(shell $(SETUP_ENVTEST) use --use-env -p path $(KUBEBUILDER_ENVTEST_KUBERNETES_VERSION)) +endif .PHONY: test test: $(SETUP_ENVTEST) ## Run unit and integration tests