From 4f2bf87cedb392b1147b69e208cee2ea1423786a Mon Sep 17 00:00:00 2001 From: junhe cao Date: Mon, 10 Aug 2026 11:32:42 -0700 Subject: [PATCH 1/5] fix(prometheus): use AL2023 for checksum builds --- build/lib/generate_staging_buildspec.sh | 19 ++++++++++++++++--- projects/prometheus/prometheus/Makefile | 1 + release/checksums-build.yml | 1 + 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/build/lib/generate_staging_buildspec.sh b/build/lib/generate_staging_buildspec.sh index 9327d93ecb..df2f6a4e7e 100755 --- a/build/lib/generate_staging_buildspec.sh +++ b/build/lib/generate_staging_buildspec.sh @@ -197,6 +197,19 @@ for project in "${PROJECTS[@]}"; do BUILDSPEC_COMPUTE_TYPE=$(make_var $PROJECT_PATH BUILDSPEC_COMPUTE_TYPE) fi + BUILDSPEC_IMAGE="" + if [[ "$BUILDSPECS_VAR" == "CHECKSUMS_BUILDSPECS" ]]; then + BUILDSPEC_IMAGE=$(make_var $PROJECT_PATH CHECKSUMS_BUILDSPEC_$((( $i + 1 )))_IMAGE) + if [[ -z "$BUILDSPEC_IMAGE" ]]; then + BUILDSPEC_IMAGE=$(make_var $PROJECT_PATH CHECKSUMS_BUILDSPEC_IMAGE) + fi + fi + + IMAGE_OVERRIDE="" + if [[ -n "$BUILDSPEC_IMAGE" ]]; then + IMAGE_OVERRIDE="\"image\":\"$BUILDSPEC_IMAGE\"," + fi + ARCH_TYPE="\"type\":\"$BUILDSPEC_PLATFORM\",\"compute-type\":\"$BUILDSPEC_COMPUTE_TYPE\"," BUILDSPEC_VARS_VALUES="" @@ -279,7 +292,7 @@ for project in "${PROJECTS[@]}"; do ALL_PROJECT_IDS+="\"$IDENTIFIER_WITH_VAL\"," PREVIOUS_SPEC_IDENTIFIERS+="$IDENTIFIER_WITH_VAL " yq eval -i -P \ - ".batch.build-graph += [{\"identifier\":\"$IDENTIFIER_WITH_VAL\",$buildspec_field$DEPEND_ON\"env\":{$ARCH_TYPE\"variables\":{\"PROJECT_PATH\": \"projects/$org/$repo\"$CLONE_URL,\"${KEYS[0]}\":\"$val1\"$EXTRA_VARS}}}]" \ + ".batch.build-graph += [{\"identifier\":\"$IDENTIFIER_WITH_VAL\",$buildspec_field$DEPEND_ON\"env\":{$ARCH_TYPE$IMAGE_OVERRIDE\"variables\":{\"PROJECT_PATH\": \"projects/$org/$repo\"$CLONE_URL,\"${KEYS[0]}\":\"$val1\"$EXTRA_VARS}}}]" \ $STAGING_BUILDSPEC_FILE done @@ -312,7 +325,7 @@ for project in "${PROJECTS[@]}"; do ALL_PROJECT_IDS+="\"$IDENTIFIER_WITH_VAL\"," PREVIOUS_SPEC_IDENTIFIERS+="$IDENTIFIER_WITH_VAL " yq eval -i -P \ - ".batch.build-graph += [{\"identifier\":\"$IDENTIFIER_WITH_VAL\",$buildspec_field$DEPEND_ON\"env\":{$ARCH_TYPE\"variables\":{\"PROJECT_PATH\": \"projects/$org/$repo\"$CLONE_URL,\"${KEYS[0]}\":\"$val1\",\"${KEYS[1]}\":\"$val2\"$EXTRA_VARS}}}]" \ + ".batch.build-graph += [{\"identifier\":\"$IDENTIFIER_WITH_VAL\",$buildspec_field$DEPEND_ON\"env\":{$ARCH_TYPE$IMAGE_OVERRIDE\"variables\":{\"PROJECT_PATH\": \"projects/$org/$repo\"$CLONE_URL,\"${KEYS[0]}\":\"$val1\",\"${KEYS[1]}\":\"$val2\"$EXTRA_VARS}}}]" \ $STAGING_BUILDSPEC_FILE done done @@ -321,7 +334,7 @@ for project in "${PROJECTS[@]}"; do ALL_PROJECT_IDS+="\"$IDENTIFIER\"," PREVIOUS_SPEC_IDENTIFIERS+="$IDENTIFIER " yq eval -i -P \ - ".batch.build-graph += [{\"identifier\":\"$IDENTIFIER\",$buildspec_field$DEPEND_ON\"env\":{$ARCH_TYPE\"variables\":{\"PROJECT_PATH\": \"projects/$org/$repo\"$CLONE_URL}}}]" \ + ".batch.build-graph += [{\"identifier\":\"$IDENTIFIER\",$buildspec_field$DEPEND_ON\"env\":{$ARCH_TYPE$IMAGE_OVERRIDE\"variables\":{\"PROJECT_PATH\": \"projects/$org/$repo\"$CLONE_URL}}}]" \ $STAGING_BUILDSPEC_FILE fi done diff --git a/projects/prometheus/prometheus/Makefile b/projects/prometheus/prometheus/Makefile index 970f729610..e51c677133 100644 --- a/projects/prometheus/prometheus/Makefile +++ b/projects/prometheus/prometheus/Makefile @@ -47,6 +47,7 @@ include $(BASE_DIRECTORY)/Common.mk # Strip any existing suffix (e.g., .2) and append .2023 # Example: standard-abc123.2 → standard-abc123.2023 CURRENT_BUILDER_BASE_TAG := $(firstword $(subst ., ,$(CURRENT_BUILDER_BASE_TAG))).2023 +CHECKSUMS_BUILDSPEC_IMAGE=$(BASE_IMAGE_REPO)/builder-base:$(CURRENT_BUILDER_BASE_TAG) # Before running GO_MOD_DOWNLOAD_TARGETS, we need to generate web UI related # resources. diff --git a/release/checksums-build.yml b/release/checksums-build.yml index cc54311139..18a73e4b8d 100644 --- a/release/checksums-build.yml +++ b/release/checksums-build.yml @@ -547,6 +547,7 @@ batch: env: type: ARM_CONTAINER compute-type: BUILD_GENERAL1_LARGE + image: public.ecr.aws/eks-distro-build-tooling/builder-base:standard-ec39a22a692a667411d582405edec7f191486e52.2023 variables: PROJECT_PATH: projects/prometheus/prometheus CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/prometheus.prometheus From 1549b8c4b18c72104e61b06c3997feccb783234d Mon Sep 17 00:00:00 2001 From: junhe cao Date: Fri, 18 Sep 2026 11:37:28 -0700 Subject: [PATCH 2/5] fix: update stale checksums Signed-off-by: junhe cao --- projects/emissary-ingress/emissary/CHECKSUMS | 24 +++++++++---------- .../cluster-api-provider-nutanix/CHECKSUMS | 4 ++-- projects/prometheus/prometheus/CHECKSUMS | 8 +++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/projects/emissary-ingress/emissary/CHECKSUMS b/projects/emissary-ingress/emissary/CHECKSUMS index 303e3f59b8..7ee3fb099f 100644 --- a/projects/emissary-ingress/emissary/CHECKSUMS +++ b/projects/emissary-ingress/emissary/CHECKSUMS @@ -1,12 +1,12 @@ -da8bfae36c4eea0fdb7a25a9c667821fd197d75b26aff742e39aa2f9fac0c657 _output/bin/emissary/linux-amd64/apiext -9413470d7fa31fb48fb923b473158ac2db8877fdda5cfbc448aa86297eb31e40 _output/bin/emissary/linux-amd64/busyambassador -a43b6754eccffaf13bbdbe92512de96649952cc68209ddf1df0fc66cb35e93c2 _output/bin/emissary/linux-amd64/capabilities_wrapper -a4e6e75d6adf1422a16cbff9326823f716ebdd06366e16d102f46b100437aeab _output/bin/emissary/linux-amd64/example-envoy-metrics-sink -7aabecfe045d7fc3603924ffd4ea57997942a66e780451189fa00d42e7e9f44a _output/bin/emissary/linux-amd64/kat-client -48064c9a618bbcb1dbb3a9ccba276849a193527e78c08ec32d30590253ddd65c _output/bin/emissary/linux-amd64/kat-server -27340e05cbe52402543ca79ca1ff8738b17164dc3ee65e3b860a4801162c4e29 _output/bin/emissary/linux-arm64/apiext -f6f895195647bef8fdb4a9b1e42ba1d3af6e0970d7c20f277b85a9e1797d4fe6 _output/bin/emissary/linux-arm64/busyambassador -e6178c8a53b33e81eb31c1dd180a4dddebcdac4c5d55beef733b32cae92d8b2e _output/bin/emissary/linux-arm64/capabilities_wrapper -6cd8c4537881b0f204cb92f4b279f7ed93dfa4b6e488d72d0d42db29d1008859 _output/bin/emissary/linux-arm64/example-envoy-metrics-sink -5b47617568fa1b9f66ac93fac852f63cb03ac952dfc00404daa57793b4475857 _output/bin/emissary/linux-arm64/kat-client -5ac0b9f94a71ad755bb45bdf3baeaec4a7a4dcaaf49414e07cf9d9519b1e3385 _output/bin/emissary/linux-arm64/kat-server +fc74e7e4602e512a679236c51d79e7b56bd0dbfbf7e42bbf04f4cc00d693a8ea _output/bin/emissary/linux-amd64/apiext +c397f90f990b3f6a359e82d8aa119f699bf71273d8ebfca956dfac1718107ecc _output/bin/emissary/linux-amd64/busyambassador +4a0f7164d1ce2938bc446b27faeb30456ca3448d04d7db0555bea9e99dcb0877 _output/bin/emissary/linux-amd64/capabilities_wrapper +0776adf714dfc63bd441a912d3d5adf56e0683fad032bf9c79325c06835f35cc _output/bin/emissary/linux-amd64/example-envoy-metrics-sink +7141731a2caa1a9f72102ad31a8399613eb80ef6e06166245f97a2af46a32249 _output/bin/emissary/linux-amd64/kat-client +ee16135a1ea11a5578cf284f18178223ef50f35aa8a06c0f9aef42df18e1a6ea _output/bin/emissary/linux-amd64/kat-server +8c2ebaa6c5e55d15104284a9dc36a7922fe22123dca4d7ef51b65c2063e92f0d _output/bin/emissary/linux-arm64/apiext +2e71c81eabcd6c29e214026d768f95b5388f264f59fbb85a4631123d1b335c35 _output/bin/emissary/linux-arm64/busyambassador +4dbe5a23664a36a95c71643abdf6bf77bcac6aea3ba82c1ea907edf7b7556e7a _output/bin/emissary/linux-arm64/capabilities_wrapper +d4b102131a4431b341bec672201b9bfabd6462f04aa1ddef4702dd7fa0175294 _output/bin/emissary/linux-arm64/example-envoy-metrics-sink +8c055b04ed46e52559439d959a38c97ae3ba028069e0c7ee3f61f10ccaba1236 _output/bin/emissary/linux-arm64/kat-client +ea3957c80888370994504ebbda465f54808517944ef768db3d53ebe13630a806 _output/bin/emissary/linux-arm64/kat-server diff --git a/projects/nutanix-cloud-native/cluster-api-provider-nutanix/CHECKSUMS b/projects/nutanix-cloud-native/cluster-api-provider-nutanix/CHECKSUMS index 9fa7749c1a..0468ca5807 100644 --- a/projects/nutanix-cloud-native/cluster-api-provider-nutanix/CHECKSUMS +++ b/projects/nutanix-cloud-native/cluster-api-provider-nutanix/CHECKSUMS @@ -1,2 +1,2 @@ -7562e08f9e8f750d09d438c8e5ff8660ded2dc211b6bbb95c278bd0480e2dc0d _output/bin/cluster-api-provider-nutanix/linux-amd64/manager -ea944d0a2084d61a2b167637be34bb64357faa4c4e4072ac2a940c02cb57340f _output/bin/cluster-api-provider-nutanix/linux-arm64/manager +c3a7bcdc6fc63d375eab557270f5713668012cecba5806fd1b663cbed2963e9a _output/bin/cluster-api-provider-nutanix/linux-amd64/manager +c06ca6bf495136241157655fe043477e31d3ae4dd9e3d46828e4cc844d734065 _output/bin/cluster-api-provider-nutanix/linux-arm64/manager diff --git a/projects/prometheus/prometheus/CHECKSUMS b/projects/prometheus/prometheus/CHECKSUMS index 97562dfc93..af9332a8a8 100644 --- a/projects/prometheus/prometheus/CHECKSUMS +++ b/projects/prometheus/prometheus/CHECKSUMS @@ -1,4 +1,4 @@ -88258394157e7e8cb22659dc16fd44e6b0ba67a2fe6adf247e91ec7c0f75a344 _output/bin/prometheus/linux-amd64/prometheus -d35a1f78d67c26ba05820623b10a4f543c4ee7789a9284dc648275333abe30fa _output/bin/prometheus/linux-amd64/promtool -028c3322cd60c4a52a47fce13c1ed53e9711f51051ec55e963dc8d23070719b3 _output/bin/prometheus/linux-arm64/prometheus -e6bc6c30b90a4dc2902fb510950017d7efcd74dcbfc79c0f4bfffe2b0a8fdef4 _output/bin/prometheus/linux-arm64/promtool +54484d91f907e623a0fbd47aff5df338a0605cb076e3452b079a82886bba4b0f _output/bin/prometheus/linux-amd64/prometheus +3635ec79defa0f3bba554102c7ee41b707330562184de79f56440fac2a362ac9 _output/bin/prometheus/linux-amd64/promtool +80396fcf587bcb867e4f73c2b860cc6897a021e8f6dfb61b21d8814c27538ca9 _output/bin/prometheus/linux-arm64/prometheus +b45846856d998894925430fc517446c9d213d5e0dae005a708aa717d39257ee1 _output/bin/prometheus/linux-arm64/promtool From 0cb960b2873ac597e7689832627b09cf205bb10f Mon Sep 17 00:00:00 2001 From: junhe cao Date: Fri, 18 Sep 2026 13:16:35 -0700 Subject: [PATCH 3/5] fix(capn): use controller-tools compatible with Go 1.25 Signed-off-by: junhe cao --- .../nutanix-cloud-native/cluster-api-provider-nutanix/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/nutanix-cloud-native/cluster-api-provider-nutanix/Makefile b/projects/nutanix-cloud-native/cluster-api-provider-nutanix/Makefile index 28e6119788..0d05fe86e5 100644 --- a/projects/nutanix-cloud-native/cluster-api-provider-nutanix/Makefile +++ b/projects/nutanix-cloud-native/cluster-api-provider-nutanix/Makefile @@ -34,7 +34,7 @@ $(TOOLS_BIN_DIR): @mkdir -p $(TOOLS_BIN_DIR) $(CONTROLLER_GEN): $(TOOLS_BIN_DIR) - GOBIN=$(TOOLS_BIN_DIR) $(GO) install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 + GOBIN=$(TOOLS_BIN_DIR) $(GO) install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.17.0 .PHONY: create-manifests create-manifests: export PATH:=$(TOOLS_BIN_DIR):$(MAKE_ROOT)/$(OUTPUT_DIR):$(PATH) From f79594c81fbc8b2f7028ac3587ebfbd0827bbb0d Mon Sep 17 00:00:00 2001 From: junhe cao Date: Fri, 18 Sep 2026 14:51:12 -0700 Subject: [PATCH 4/5] fix: update generated Prometheus builder image --- release/checksums-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/checksums-build.yml b/release/checksums-build.yml index 18a73e4b8d..db6ed2acc8 100644 --- a/release/checksums-build.yml +++ b/release/checksums-build.yml @@ -547,7 +547,7 @@ batch: env: type: ARM_CONTAINER compute-type: BUILD_GENERAL1_LARGE - image: public.ecr.aws/eks-distro-build-tooling/builder-base:standard-ec39a22a692a667411d582405edec7f191486e52.2023 + image: public.ecr.aws/eks-distro-build-tooling/builder-base:standard-930cea64d6ae99fa9e5f165aba33af1c8f283726.2023 variables: PROJECT_PATH: projects/prometheus/prometheus CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/prometheus.prometheus From 285d52dd0fc1b115d9af0f8a206e8bbb7ffd9614 Mon Sep 17 00:00:00 2001 From: junhe cao Date: Fri, 18 Sep 2026 15:56:14 -0700 Subject: [PATCH 5/5] fix(prometheus): update checksums for shallow clone --- projects/prometheus/prometheus/CHECKSUMS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/prometheus/prometheus/CHECKSUMS b/projects/prometheus/prometheus/CHECKSUMS index af9332a8a8..7a8cd8007f 100644 --- a/projects/prometheus/prometheus/CHECKSUMS +++ b/projects/prometheus/prometheus/CHECKSUMS @@ -1,4 +1,4 @@ -54484d91f907e623a0fbd47aff5df338a0605cb076e3452b079a82886bba4b0f _output/bin/prometheus/linux-amd64/prometheus -3635ec79defa0f3bba554102c7ee41b707330562184de79f56440fac2a362ac9 _output/bin/prometheus/linux-amd64/promtool -80396fcf587bcb867e4f73c2b860cc6897a021e8f6dfb61b21d8814c27538ca9 _output/bin/prometheus/linux-arm64/prometheus -b45846856d998894925430fc517446c9d213d5e0dae005a708aa717d39257ee1 _output/bin/prometheus/linux-arm64/promtool +99f163d25432609c01ec4d38c458bfd9fb4706beeee84a3d2b00c6dd37d506ad _output/bin/prometheus/linux-amd64/prometheus +e1439a95fdbfb0549c8a94a0f2b68967a4fbf043ab09dcc62e6a1aaae6abe15f _output/bin/prometheus/linux-amd64/promtool +094bf0363ea6a55fcfbdd4e604542e3ff36d79be43699ae7fa827fed63eede16 _output/bin/prometheus/linux-arm64/prometheus +332c119e2a7292ce438437865e31eab78ba5c198658a797e0761727034ba372f _output/bin/prometheus/linux-arm64/promtool