From a084ce83ceb56b0101e020142b65ce9e5a682d9c Mon Sep 17 00:00:00 2001 From: Ilya Zuyev Date: Tue, 20 Apr 2021 11:24:49 -0700 Subject: [PATCH] remove PRELOAD_TOOL var --- Makefile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 33ac1e0eda..3560357b92 100644 --- a/Makefile +++ b/Makefile @@ -683,18 +683,16 @@ ifndef AUTOPUSH endif env $(X_BUILD_ENV) docker buildx build --builder $(X_DOCKER_BUILDER) --platform $(KICBASE_ARCH) $(addprefix -t ,$(KICBASE_IMAGE_REGISTRIES)) --push --build-arg COMMIT_SHA=${VERSION}-$(COMMIT) ./deploy/kicbase -PRELOAD_TOOL = out/preload-tool - -$(PRELOAD_TOOL): +out/preload-tool: go build -ldflags="$(MINIKUBE_LDFLAGS)" -o $@ ./hack/preload-images/*.go .PHONY: upload-preloaded-images-tar -upload-preloaded-images-tar: out/minikube $(PRELOAD_TOOL) ## Upload the preloaded images for oldest supported, newest supported, and default kubernetes versions to GCS. - $(PRELOAD_TOOL) +upload-preloaded-images-tar: out/minikube out/preload-tool ## Upload the preloaded images for oldest supported, newest supported, and default kubernetes versions to GCS. + out/preload-tool .PHONY: generate-preloaded-images-tar -generate-preloaded-images-tar: out/minikube $(PRELOAD_TOOL) ## Generates the preloaded images for oldest supported, newest supported, and default kubernetes versions - $(PRELOAD_TOOL) --no-upload +generate-preloaded-images-tar: out/minikube out/preload-tool ## Generates the preloaded images for oldest supported, newest supported, and default kubernetes versions + out/preload-tool --no-upload ALL_ARCH = amd64 arm arm64 ppc64le s390x IMAGE = $(REGISTRY)/storage-provisioner