From 55eed942454c5e585105a79e00a62858655b1927 Mon Sep 17 00:00:00 2001
From: Ciprian Hacman <ciprian@hakman.dev>
Date: Mon, 29 Sep 2025 06:34:38 +0300
Subject: [PATCH] Copy the release binaries from the promoted image

---
 Makefile | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/Makefile b/Makefile
index 6d9b10767..edda4a0a1 100644
--- a/Makefile
+++ b/Makefile
@@ -271,6 +271,31 @@ $(NPD_NAME_VERSION)-%.tar.gz: $(ALL_BINARIES) test/e2e-install.sh
 	(cd output/$*/ && tar -zcvf ../../$@ *)
 	sha512sum $@ > $@.sha512
 
+image-$(NPD_NAME_VERSION)-linux_%.tar.gz: output/linux_%/test/bin/problem-maker test/e2e-install.sh
+	mkdir -p output/linux_$*/bin output/linux_$*/test
+	docker create --name npd-$* --platform linux/$* gcr.io/k8s-staging-npd/node-problem-detector:$(TAG)
+	docker cp npd-$*:/node-problem-detector output/linux_$*/bin/
+	docker cp npd-$*:/home/kubernetes/bin/health-checker output/linux_$*/bin/
+	docker cp npd-$*:/home/kubernetes/bin/log-counter output/linux_$*/bin/
+	docker cp npd-$*:/config output/linux_$*/
+	docker rm -v npd-$*
+	cp test/e2e-install.sh output/linux_$*/test/e2e-install.sh
+	(cd output/linux_$*/ && tar -zcvf ../../$@ *)
+	cp $@ $(NPD_NAME_VERSION)-linux_$*.tar.gz
+	sha512sum $@ > $(NPD_NAME_VERSION)-linux_$*.tar.gz.sha512
+
+image-$(NPD_NAME_VERSION)-windows_%.tar.gz: output/windows_%/test/bin/problem-maker.exe test/e2e-install.sh
+	mkdir -p output/windows_$*/bin output/windows_$*/test/
+	docker create --name npd-$* --platform windows/$* gcr.io/k8s-staging-npd/node-problem-detector-windows:$(TAG)
+	docker cp npd-$*:/Files/node-problem-detector.exe output/windows_$*/bin/
+	docker cp npd-$*:/Files/etc/kubernetes/node/bin/health-checker.exe output/windows_$*/bin/
+	docker cp npd-$*:/Files/config output/windows_$*/
+	docker rm -v npd-$*
+	cp test/e2e-install.sh output/windows_$*/test/e2e-install.sh
+	(cd output/windows_$*/ && tar -zcvf ../../$@ *)
+	cp $@ $(NPD_NAME_VERSION)-windows_$*.tar.gz
+	sha512sum $@ > $(NPD_NAME_VERSION)-windows_$*.tar.gz.sha512
+
 build-binaries: $(ALL_BINARIES)
 
 build-container: clean Dockerfile
@@ -316,6 +341,9 @@ push: push-container push-tar
 # `make release` is used when releasing a new NPD version.
 release: push-container build-tar print-tar-sha-md5
 
+# `make release-new` is experimentally used when releasing a new NPD version.
+release-new: image-$(NPD_NAME_VERSION)-linux_amd64.tar.gz image-$(NPD_NAME_VERSION)-linux_arm64.tar.gz image-$(NPD_NAME_VERSION)-windows_amd64.tar.gz print-tar-sha-md5
+
 print-tar-sha-md5: build-tar
 	./hack/print-tar-sha-md5.sh $(VERSION)