From 454e7d73a78b57b204b54e6f3122ddb68ddc1435 Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Wed, 11 Feb 2026 11:19:31 -0800 Subject: [PATCH 1/5] Inherit GOOS/GOARCH from shell in docker-generate --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b843ff4ab7..5fdd480276 100644 --- a/Makefile +++ b/Makefile @@ -179,7 +179,7 @@ generate: $(BPF2GO) .PHONY: docker-generate docker-generate: @echo "### Generating files (docker)..." - @OTEL_EBPF_GENFILES_GEN_IMG=$(GEN_IMG) go generate cmd/obi-genfiles/obi_genfiles.go + @GOOS=$(shell go env GOOS) GOARCH=$(shell go env GOARCH) OTEL_EBPF_GENFILES_GEN_IMG=$(GEN_IMG) go generate cmd/obi-genfiles/obi_genfiles.go .PHONY: verify verify: prereqs lint test license-header-check From 9b726dbbd5e35e5a5ffec8c82de4c73ba62e8e3a Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Wed, 11 Feb 2026 11:20:06 -0800 Subject: [PATCH 2/5] Inherit Dockerhub token from release workflows Resolves the error where the docker image builds are missing the Dockerhub password on login. --- .github/workflows/publish_dockerhub_k8s_cache_main.yml | 4 ++++ .github/workflows/publish_dockerhub_main.yml | 4 ++++ .github/workflows/release.yml | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/.github/workflows/publish_dockerhub_k8s_cache_main.yml b/.github/workflows/publish_dockerhub_k8s_cache_main.yml index cc52c15157..35fba3b34b 100644 --- a/.github/workflows/publish_dockerhub_k8s_cache_main.yml +++ b/.github/workflows/publish_dockerhub_k8s_cache_main.yml @@ -10,6 +10,10 @@ on: description: "Git ref (commit, branch, or tag) to check out" required: false type: string + secrets: + DOCKER_TOKEN_EBPF_INSTRUMENTATION: + description: "Docker Hub access token for otel" + required: true permissions: contents: read diff --git a/.github/workflows/publish_dockerhub_main.yml b/.github/workflows/publish_dockerhub_main.yml index 5eba2d3cd5..460a0ebc18 100644 --- a/.github/workflows/publish_dockerhub_main.yml +++ b/.github/workflows/publish_dockerhub_main.yml @@ -10,6 +10,10 @@ on: description: "Git ref (commit, branch, or tag) to check out" required: false type: string + secrets: + DOCKER_TOKEN_EBPF_INSTRUMENTATION: + description: "Docker Hub access token for otel" + required: true permissions: contents: read diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 27e97b97fa..b86a6545eb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -228,6 +228,8 @@ jobs: packages: write with: ref: ${{ inputs.tag || github.ref_name }} + secrets: + DOCKER_TOKEN_EBPF_INSTRUMENTATION: ${{ secrets.DOCKER_TOKEN_EBPF_INSTRUMENTATION }} docker-publish-k8s-cache: name: Publish Docker Image (k8s cache) @@ -239,6 +241,8 @@ jobs: packages: write with: ref: ${{ inputs.tag || github.ref_name }} + secrets: + DOCKER_TOKEN_EBPF_INSTRUMENTATION: ${{ secrets.DOCKER_TOKEN_EBPF_INSTRUMENTATION }} build-artifacts: name: Build Release Artifacts From 5979f746f6ff546b2b66ef45cbf980c3049cf8b5 Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Wed, 11 Feb 2026 12:43:49 -0800 Subject: [PATCH 3/5] Use GOHOST* instead of GO* in docker-generate --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5fdd480276..ca606fb95b 100644 --- a/Makefile +++ b/Makefile @@ -179,7 +179,7 @@ generate: $(BPF2GO) .PHONY: docker-generate docker-generate: @echo "### Generating files (docker)..." - @GOOS=$(shell go env GOOS) GOARCH=$(shell go env GOARCH) OTEL_EBPF_GENFILES_GEN_IMG=$(GEN_IMG) go generate cmd/obi-genfiles/obi_genfiles.go + @GOOS=$(shell go env GOHOSTOS) GOARCH=$(shell go env GOHOSTARCH) OTEL_EBPF_GENFILES_GEN_IMG=$(GEN_IMG) go generate cmd/obi-genfiles/obi_genfiles.go .PHONY: verify verify: prereqs lint test license-header-check From cab74da214fe17eaf46b36a65bf98b0e158c51ca Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Wed, 11 Feb 2026 12:44:25 -0800 Subject: [PATCH 4/5] Use a staging dir in artifact --- Makefile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ca606fb95b..eea2863392 100644 --- a/Makefile +++ b/Makefile @@ -443,10 +443,15 @@ license-header-check: .PHONY: artifact artifact: docker-generate compile compile-cache java-docker-build @echo "### Packing generated artifact for $(GOOS)/$(GOARCH)" - cp LICENSE ./bin - cp NOTICE ./bin - cp -r NOTICES ./bin - tar -C ./bin -czf bin/obi-$(RELEASE_VERSION)-$(GOOS)-$(GOARCH).tar.gz $(CMD) $(CACHE_CMD) $(JAVA_AGENT) LICENSE NOTICE NOTICES + @STAGING_DIR=$$(mktemp -d); \ + trap "rm -rf $$STAGING_DIR" EXIT; \ + cp ./bin/$(CMD) $$STAGING_DIR/; \ + cp ./bin/$(CACHE_CMD) $$STAGING_DIR/; \ + cp ./bin/$(JAVA_AGENT) $$STAGING_DIR/; \ + cp LICENSE $$STAGING_DIR/; \ + cp NOTICE $$STAGING_DIR/; \ + cp -r NOTICES $$STAGING_DIR/; \ + tar -C $$STAGING_DIR -czf bin/obi-$(RELEASE_VERSION)-$(GOOS)-$(GOARCH).tar.gz $(CMD) $(CACHE_CMD) $(JAVA_AGENT) LICENSE NOTICE NOTICES .PHONY: release release: clean-release-dir From 639ca49997b1fb24ec99fa21c2880bd05e9446f0 Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Wed, 11 Feb 2026 12:54:45 -0800 Subject: [PATCH 5/5] Update Makefile Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index eea2863392..b3d9fe55fc 100644 --- a/Makefile +++ b/Makefile @@ -443,7 +443,7 @@ license-header-check: .PHONY: artifact artifact: docker-generate compile compile-cache java-docker-build @echo "### Packing generated artifact for $(GOOS)/$(GOARCH)" - @STAGING_DIR=$$(mktemp -d); \ + @STAGING_DIR=$$(mktemp -d 2>/dev/null || mktemp -d -t obi.XXXXXX); \ trap "rm -rf $$STAGING_DIR" EXIT; \ cp ./bin/$(CMD) $$STAGING_DIR/; \ cp ./bin/$(CACHE_CMD) $$STAGING_DIR/; \