Skip to content

Commit 6ff6753

Browse files
committed
image-util.sh: fix gcr.io/.../agnhost:2.46-linux-amd64 is a manifest list
Fix issue 123266 > CI: `post-kubernetes-push-e2e-agnhost-test-images` is failing > (`gcr.io/k8s-staging-e2e-test-images/agnhost:2.46-linux-amd64 is a manifest list`) To avoid creating a manifest list with the recent version of buildx, `--provenance=false --sbom=false` has to be specified. Signed-off-by: Akihiro Suda <[email protected]>
1 parent 498f02d commit 6ff6753

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

test/images/image-util.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,8 @@ build() {
185185
"${SED}" -i '/CROSS_BUILD_/d' Dockerfile
186186
fi
187187

188-
docker buildx build --progress=plain --no-cache --pull --output=type="${output_type}" --platform "${os_name}/${arch}" \
188+
# `--provenance=false --sbom=false` is set to avoid creating a manifest list: https://github.com/kubernetes/kubernetes/issues/123266
189+
docker buildx build --progress=plain --no-cache --pull --output=type="${output_type}" --platform "${os_name}/${arch}" --provenance=false --sbom=false \
189190
--build-arg BASEIMAGE="${base_image}" --build-arg REGISTRY="${REGISTRY}" --build-arg OS_VERSION="${os_version}" \
190191
-t "${REGISTRY}/${image}:${TAG}-${suffix}" -f "${dockerfile_name}" \
191192
--label "image_version=${TAG}" --label "commit_id=${GIT_COMMIT_ID}" \

0 commit comments

Comments
 (0)