Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ $(NPD_NAME_VERSION)-%.tar.gz: $(ALL_BINARIES) test/e2e-install.sh

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 create --name npd-$* --platform linux/$* registry.k8s.io/node-problem-detector/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/
Expand All @@ -284,19 +284,19 @@ image-$(NPD_NAME_VERSION)-linux_%.tar.gz: output/linux_%/test/bin/problem-maker
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
sha512sum $(NPD_NAME_VERSION)-linux_$*.tar.gz > $(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 create --name npd-$* --platform windows/$* registry.k8s.io/node-problem-detector/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
sha512sum $(NPD_NAME_VERSION)-windows_$*.tar.gz > $(NPD_NAME_VERSION)-windows_$*.tar.gz.sha512

build-binaries: $(ALL_BINARIES)

Expand Down Expand Up @@ -346,7 +346,7 @@ 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
print-tar-sha-md5:
./hack/print-tar-sha-md5.sh $(VERSION)

coverage.out:
Expand Down