From 1702fc5fbce2d0b667306334d47fc6ab53e7c5d2 Mon Sep 17 00:00:00 2001 From: Alper Polat Date: Tue, 30 Apr 2024 21:28:25 +0300 Subject: [PATCH 1/3] Sign node exporter darwin binary with rcodesign Prevents SIGKILL issues on macs Signed-off-by: Alper Polat --- .circleci/config.yml | 6 ++++++ Makefile.common | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0e29a6afdc..ae273da458 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -49,6 +49,12 @@ jobs: - run: docker run --privileged linuxkit/binfmt:af88a591f9cc896a52ce596b9cf7ca26a061ef97 - run: promu crossbuild -v --parallelism $CIRCLE_NODE_TOTAL --parallelism-thread $CIRCLE_NODE_INDEX - run: promu --config .promu-cgo.yml crossbuild -v --parallelism $CIRCLE_NODE_TOTAL --parallelism-thread $CIRCLE_NODE_INDEX + # sign the darwin build so it doesn't get SIGKILLed on start, see: https://github.com/prometheus/node_exporter/issues/2539 + - run: + command: | + if [ -d "$(pwd)/.build/darwin-arm64" ]; then + promu codesign "$(pwd)/.build/darwin-arm64/node_exporter" + fi - persist_to_workspace: root: . paths: diff --git a/Makefile.common b/Makefile.common index 0acfb9d806..0e9ace29b4 100644 --- a/Makefile.common +++ b/Makefile.common @@ -55,7 +55,7 @@ ifneq ($(shell command -v gotestsum 2> /dev/null),) endif endif -PROMU_VERSION ?= 0.15.0 +PROMU_VERSION ?= 0.17.0 PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_VERSION)/promu-$(PROMU_VERSION).$(GO_BUILD_PLATFORM).tar.gz SKIP_GOLANGCI_LINT := From c8d355fb033382b07970adb654969ede7029f43f Mon Sep 17 00:00:00 2001 From: Alper Polat <101826653+gitperr@users.noreply.github.com> Date: Wed, 1 May 2024 16:47:24 +0300 Subject: [PATCH 2/3] Be explicit about checking for the binary Co-authored-by: Ben Kochie Signed-off-by: Alper Polat <101826653+gitperr@users.noreply.github.com> --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ae273da458..2f6bd76ead 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -52,7 +52,7 @@ jobs: # sign the darwin build so it doesn't get SIGKILLed on start, see: https://github.com/prometheus/node_exporter/issues/2539 - run: command: | - if [ -d "$(pwd)/.build/darwin-arm64" ]; then + if [[ -f "$(pwd)/.build/darwin-arm64/node_exporter" ]]; then promu codesign "$(pwd)/.build/darwin-arm64/node_exporter" fi - persist_to_workspace: From dced35421a7404d248b5e0215e53d7537df8ffc7 Mon Sep 17 00:00:00 2001 From: Alper Polat Date: Wed, 1 May 2024 16:50:53 +0300 Subject: [PATCH 3/3] Also attempt to sign darwin-amd64 Signed-off-by: Alper Polat --- .circleci/config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2f6bd76ead..8cf200b826 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -55,6 +55,10 @@ jobs: if [[ -f "$(pwd)/.build/darwin-arm64/node_exporter" ]]; then promu codesign "$(pwd)/.build/darwin-arm64/node_exporter" fi + + if [[ -f "$(pwd)/.build/darwin-amd64/node_exporter" ]]; then + promu codesign "$(pwd)/.build/darwin-amd64/node_exporter" + fi - persist_to_workspace: root: . paths: