Skip to content

fix(prometheus): use AL2023 for checksum builds #5630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eks-distro-bot merged 6 commits into from
Sep 19, 2026
+23 −8
Merged

fix(prometheus): use AL2023 for checksum builds #5630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4f2bf87
fix(prometheus): use AL2023 for checksum builds
howard-junec Aug 10, 2026
1549b8c
fix: update stale checksums
howard-junec Sep 18, 2026
0cb960b
fix(capn): use controller-tools compatible with Go 1.25
howard-junec Sep 18, 2026
f79594c
fix: update generated Prometheus builder image
howard-junec Sep 18, 2026
86b9e00
Merge remote-tracking branch 'upstream/main' into fix/prometheus-chec…
howard-junec Sep 18, 2026
285d52d
fix(prometheus): update checksums for shallow clone
howard-junec Sep 18, 2026
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
19 changes: 16 additions & 3 deletions build/lib/generate_staging_buildspec.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=""
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion projects/nutanix-cloud-native/cluster-api-provider-nutanix/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions projects/prometheus/prometheus/CHECKSUMS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
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
1 change: 1 addition & 0 deletions projects/prometheus/prometheus/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions release/checksums-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-930cea64d6ae99fa9e5f165aba33af1c8f283726.2023
variables:
PROJECT_PATH: projects/prometheus/prometheus
CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/prometheus.prometheus
Expand Down