Merge pull request #7080 from sbueringer/pr-use-kubebuilder-darwin-arm

🌱 kubebuilder: switch back to darwin arm64 binaries

Author: k8s-ci-robot

Makefile

@@ -39,7 +39,7 @@ export GO111MODULE=on
 #
 # Kubebuilder.
 #
-export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.24.1
+export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.24.2
 export KUBEBUILDER_CONTROLPLANE_START_TIMEOUT ?= 60s
 export KUBEBUILDER_CONTROLPLANE_STOP_TIMEOUT ?= 60s
 
@@ -625,11 +625,7 @@ docker-capd-build: ## Build the docker image for capd
 
 ARTIFACTS ?= ${ROOT_DIR}/_artifacts
 
-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
+KUBEBUILDER_ASSETS ?= $(shell $(SETUP_ENVTEST) use --use-env -p path $(KUBEBUILDER_ENVTEST_KUBERNETES_VERSION))
 
 .PHONY: test
 test: $(SETUP_ENVTEST) ## Run unit and integration tests