Skip to content

Commit 6496da3

Browse files
committed
remove preload scripts from repo and point to exeternal repo
1 parent fd0ce98 commit 6496da3

File tree

1 file changed

+19
-6
lines changed

1 file changed

+19
-6
lines changed

Makefile

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -712,16 +712,29 @@ endif
712712
./deploy/kicbase/build_auto_pause.sh $(KICBASE_ARCH)
713713
docker buildx build -f ./deploy/kicbase/Dockerfile --platform $(KICBASE_ARCH) $(addprefix -t ,$(KICBASE_IMAGE_REGISTRIES)) --push --build-arg VERSION_JSON=$(VERSION_JSON) --build-arg COMMIT_SHA=${VERSION}-$(COMMIT_NOQUOTES) --build-arg PREBUILT_AUTO_PAUSE=true .
714714

715-
out/preload-tool:
716-
cd hack && go build -ldflags="$(MINIKUBE_LDFLAGS)" -o ../$@ preload-images/*.go
715+
# preload scripts been moved to https://github.com/kubernetes-sigs/minikube-preloads/tree/main/cmd/preload-generator
716+
# in order to be able to publish them as github assets
717+
PRELOAD_GENERATOR_REPO ?= https://github.com/kubernetes-sigs/minikube-preloads.git
718+
PRELOAD_GENERATOR_DIR := $(BUILD_DIR)/preload-generator-src
719+
PRELOAD_GENERATOR_BIN := $(BUILD_DIR)/preload-generator
720+
721+
$(PRELOAD_GENERATOR_DIR):
722+
rm -rf $(PRELOAD_GENERATOR_DIR)
723+
git clone --depth=1 --branch main $(PRELOAD_GENERATOR_REPO) $(PRELOAD_GENERATOR_DIR)
724+
725+
$(PRELOAD_GENERATOR_BIN): $(PRELOAD_GENERATOR_DIR)
726+
cd $(PRELOAD_GENERATOR_DIR) && GOWORK=off GOBIN=$(BUILD_DIR) go install ./cmd/preload-generator
727+
728+
out/preload-generator: $(PRELOAD_GENERATOR_BIN)
729+
cp $(PRELOAD_GENERATOR_BIN) $@
717730

718731
.PHONY: upload-preloaded-images-tar
719-
upload-preloaded-images-tar: out/minikube out/preload-tool ## Upload the preloaded images for oldest supported, newest supported, and default kubernetes versions to GCS.
720-
out/preload-tool
732+
upload-preloaded-images-tar: out/minikube out/preload-generator ## Upload the preloaded images for oldest supported, newest supported, and default kubernetes versions to GCS.
733+
out/preload-generator
721734

722735
.PHONY: generate-preloaded-images-tar
723-
generate-preloaded-images-tar: out/minikube out/preload-tool ## Generates the preloaded images for oldest supported, newest supported, and default kubernetes versions
724-
out/preload-tool --no-upload
736+
generate-preloaded-images-tar: out/minikube out/preload-generator ## Generates the preloaded images for oldest supported, newest supported, and default kubernetes versions
737+
out/preload-generator --no-upload
725738

726739
ALL_ARCH = amd64 arm arm64 ppc64le s390x
727740
IMAGE = $(REGISTRY)/storage-provisioner

0 commit comments

Comments
 (0)