Merge pull request #22079 from medyagh/remove_preload_script

ci: remove preload script

Author: medyagh

Makefile

@@ -712,16 +712,29 @@ endif
 	./deploy/kicbase/build_auto_pause.sh $(KICBASE_ARCH)
 	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 .
 
-out/preload-tool:
-	cd hack && go build -ldflags="$(MINIKUBE_LDFLAGS)" -o ../$@ preload-images/*.go
+# preload scripts been moved to https://github.com/kubernetes-sigs/minikube-preloads/tree/main/cmd/preload-generator 
+# in order to be able to publish them as github assets 
+PRELOAD_GENERATOR_REPO ?= https://github.com/kubernetes-sigs/minikube-preloads.git
+PRELOAD_GENERATOR_DIR := $(BUILD_DIR)/preload-generator-src
+PRELOAD_GENERATOR_BIN := $(BUILD_DIR)/preload-generator
+
+$(PRELOAD_GENERATOR_DIR):
+	rm -rf $(PRELOAD_GENERATOR_DIR)
+	git clone --depth=1 --branch main $(PRELOAD_GENERATOR_REPO) $(PRELOAD_GENERATOR_DIR)
+
+$(PRELOAD_GENERATOR_BIN): $(PRELOAD_GENERATOR_DIR)
+	cd $(PRELOAD_GENERATOR_DIR) && GOWORK=off GOBIN=$(BUILD_DIR) go install ./cmd/preload-generator
+
+out/preload-generator: $(PRELOAD_GENERATOR_BIN)
+	cp $(PRELOAD_GENERATOR_BIN) $@
 
 .PHONY: upload-preloaded-images-tar
-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
+upload-preloaded-images-tar: out/minikube out/preload-generator ## Upload the preloaded images for oldest supported, newest supported, and default kubernetes versions to GCS.
+	out/preload-generator
 
 .PHONY: generate-preloaded-images-tar
-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
+generate-preloaded-images-tar: out/minikube out/preload-generator ## Generates the preloaded images for oldest supported, newest supported, and default kubernetes versions
+	out/preload-generator --no-upload
 
 ALL_ARCH = amd64 arm arm64 ppc64le s390x
 IMAGE = $(REGISTRY)/storage-provisioner

test/integration/testdata/csi-hostpath-driver/pv-pod-restore.yaml

@@ -11,7 +11,7 @@ spec:
         claimName: hpvc-restore
   containers:
     - name: task-pv-container
-      image: docker.io/nginx
+      image: public.ecr.aws/nginx/nginx:alpine
       ports:
         - containerPort: 80
           name: "http-server"

test/integration/testdata/csi-hostpath-driver/pv-pod.yaml

@@ -11,7 +11,7 @@ spec:
         claimName: hpvc
   containers:
     - name: task-pv-container
-      image: docker.io/nginx
+      image: public.ecr.aws/nginx/nginx:alpine
       ports:
         - containerPort: 80
           name: "http-server"

test/integration/testdata/nginx-gvisor.yaml

@@ -9,4 +9,4 @@ spec:
   runtimeClassName: gvisor
   containers:
   - name: nginx
-    image: docker.io/nginx
+    image: public.ecr.aws/nginx/nginx:alpine

test/integration/testdata/nginx-pod-svc.yaml

@@ -8,7 +8,7 @@ metadata:
 spec:
   containers:
   - name: nginx
-    image: docker.io/nginx:alpine
+    image: public.ecr.aws/nginx/nginx:alpine
     ports:
     - containerPort: 80
       protocol: TCP

test/integration/testdata/storage-provisioner/pod.yaml

@@ -7,7 +7,7 @@ metadata:
 spec:
   containers:
     - name: myfrontend
-      image: docker.io/nginx
+      image: public.ecr.aws/nginx/nginx:alpine
       volumeMounts:
       - mountPath: "/tmp/mount"
         name: mypd

test/integration/testdata/testsvc.yaml

@@ -8,7 +8,7 @@ metadata:
 spec:
   containers:
   - name: nginx
-    image: docker.io/nginx:alpine
+    image: public.ecr.aws/nginx/nginx:alpine
     ports:
     - containerPort: 80
       protocol: TCP