From b1b0e9d0170e773a4f9bccf70d9bf3110165b3c9 Mon Sep 17 00:00:00 2001 From: Stephen Goeddel Date: Fri, 10 Jul 2026 08:19:48 -0600 Subject: [PATCH 1/6] Re-add verify-apm to the verify target Co-Authored-By: Claude Opus 4.6 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index eba48d20f06c..42da9a65b175 100644 --- a/Makefile +++ b/Makefile @@ -50,7 +50,7 @@ verify-origin: hack/verify-generated.sh hack/verify-tls-ownership.sh .PHONY: verify-origin -verify: verify-origin +verify: verify-origin verify-apm # Update all generated artifacts. # From 4f596d105e5774f141fc619a8cdc6acc731d139b Mon Sep 17 00:00:00 2001 From: Stephen Goeddel Date: Fri, 10 Jul 2026 08:27:30 -0600 Subject: [PATCH 2/6] Declare verify as .PHONY in the Makefile Co-Authored-By: Claude Opus 4.6 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 42da9a65b175..c3aa7580137f 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ verify-origin: hack/verify-jsonformat.sh hack/verify-generated.sh hack/verify-tls-ownership.sh -.PHONY: verify-origin +.PHONY: verify-origin verify verify: verify-origin verify-apm # Update all generated artifacts. From d241ccad1a1ce6b93d9d093767ba16198f7f8cfa Mon Sep 17 00:00:00 2001 From: Stephen Goeddel Date: Fri, 10 Jul 2026 10:07:01 -0600 Subject: [PATCH 3/6] Disable uv cache in CI to avoid permission errors Co-Authored-By: Claude Opus 4.6 --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c3aa7580137f..889a7cbc5e93 100644 --- a/Makefile +++ b/Makefile @@ -114,9 +114,10 @@ test: test-tools $(call add-bindata,bindata,-ignore ".*\.(go|md)$$$$" examples/db-templates examples/image-streams examples/sample-app examples/quickstarts/... examples/hello-openshift examples/jenkins/... examples/quickstarts/cakephp-mysql.json test/extended/testdata/... e2echart,testextended,testdata,test/extended/testdata/bindata.go) # Requires uv (installed in devcontainer). Regenerates CLAUDE.md, AGENTS.md, etc. +_uvx_flags = $(if $(filter true,$(CI)),--no-cache) apm: - uvx --from apm-cli@0.13.0 apm install - uvx --from apm-cli@0.13.0 apm compile + uvx $(_uvx_flags) --from apm-cli@0.13.0 apm install + uvx $(_uvx_flags) --from apm-cli@0.13.0 apm compile .PHONY: apm verify-apm: apm From 2f7990e3f37f558b6f80c8eef391173084325a83 Mon Sep 17 00:00:00 2001 From: Stephen Goeddel Date: Fri, 10 Jul 2026 10:39:47 -0600 Subject: [PATCH 4/6] Use /tmp for uv cache and tool dirs in CI Co-Authored-By: Claude Opus 4.6 --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 889a7cbc5e93..52eae575f8d7 100644 --- a/Makefile +++ b/Makefile @@ -114,10 +114,10 @@ test: test-tools $(call add-bindata,bindata,-ignore ".*\.(go|md)$$$$" examples/db-templates examples/image-streams examples/sample-app examples/quickstarts/... examples/hello-openshift examples/jenkins/... examples/quickstarts/cakephp-mysql.json test/extended/testdata/... e2echart,testextended,testdata,test/extended/testdata/bindata.go) # Requires uv (installed in devcontainer). Regenerates CLAUDE.md, AGENTS.md, etc. -_uvx_flags = $(if $(filter true,$(CI)),--no-cache) +_uvx_env = $(if $(filter true,$(CI)),UV_CACHE_DIR=/tmp/uv-cache UV_TOOL_DIR=/tmp/uv-tools) apm: - uvx $(_uvx_flags) --from apm-cli@0.13.0 apm install - uvx $(_uvx_flags) --from apm-cli@0.13.0 apm compile + $(_uvx_env) uvx --from apm-cli@0.13.0 apm install + $(_uvx_env) uvx --from apm-cli@0.13.0 apm compile .PHONY: apm verify-apm: apm From fa6d1b215874a57465dc08f89236f81ba59657ed Mon Sep 17 00:00:00 2001 From: Stephen Goeddel Date: Tue, 14 Jul 2026 05:45:35 -0600 Subject: [PATCH 5/6] Set UV_PYTHON=python3.12 in CI to use the correct Python Co-Authored-By: Claude Opus 4.6 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 52eae575f8d7..01b40efbc819 100644 --- a/Makefile +++ b/Makefile @@ -114,7 +114,7 @@ test: test-tools $(call add-bindata,bindata,-ignore ".*\.(go|md)$$$$" examples/db-templates examples/image-streams examples/sample-app examples/quickstarts/... examples/hello-openshift examples/jenkins/... examples/quickstarts/cakephp-mysql.json test/extended/testdata/... e2echart,testextended,testdata,test/extended/testdata/bindata.go) # Requires uv (installed in devcontainer). Regenerates CLAUDE.md, AGENTS.md, etc. -_uvx_env = $(if $(filter true,$(CI)),UV_CACHE_DIR=/tmp/uv-cache UV_TOOL_DIR=/tmp/uv-tools) +_uvx_env = $(if $(filter true,$(CI)),UV_CACHE_DIR=/tmp/uv-cache UV_TOOL_DIR=/tmp/uv-tools UV_PYTHON=python3.12) apm: $(_uvx_env) uvx --from apm-cli@0.13.0 apm install $(_uvx_env) uvx --from apm-cli@0.13.0 apm compile From eaf6c0726d93bc2561c60853c3aafe61f47a8762 Mon Sep 17 00:00:00 2001 From: Stephen Goeddel Date: Tue, 14 Jul 2026 08:34:15 -0600 Subject: [PATCH 6/6] Remove UV_PYTHON override now that CI image sets python3 alternative Co-Authored-By: Claude Opus 4.6 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 01b40efbc819..52eae575f8d7 100644 --- a/Makefile +++ b/Makefile @@ -114,7 +114,7 @@ test: test-tools $(call add-bindata,bindata,-ignore ".*\.(go|md)$$$$" examples/db-templates examples/image-streams examples/sample-app examples/quickstarts/... examples/hello-openshift examples/jenkins/... examples/quickstarts/cakephp-mysql.json test/extended/testdata/... e2echart,testextended,testdata,test/extended/testdata/bindata.go) # Requires uv (installed in devcontainer). Regenerates CLAUDE.md, AGENTS.md, etc. -_uvx_env = $(if $(filter true,$(CI)),UV_CACHE_DIR=/tmp/uv-cache UV_TOOL_DIR=/tmp/uv-tools UV_PYTHON=python3.12) +_uvx_env = $(if $(filter true,$(CI)),UV_CACHE_DIR=/tmp/uv-cache UV_TOOL_DIR=/tmp/uv-tools) apm: $(_uvx_env) uvx --from apm-cli@0.13.0 apm install $(_uvx_env) uvx --from apm-cli@0.13.0 apm compile