From 6ff675310c969c454c01ae8b4f7bff0af872741d Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 14 Feb 2024 01:37:05 +0900 Subject: [PATCH] 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 --- test/images/image-util.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/images/image-util.sh b/test/images/image-util.sh index 9b729b34fe6..12c2d3e5933 100755 --- a/test/images/image-util.sh +++ b/test/images/image-util.sh @@ -185,7 +185,8 @@ build() { "${SED}" -i '/CROSS_BUILD_/d' Dockerfile fi - docker buildx build --progress=plain --no-cache --pull --output=type="${output_type}" --platform "${os_name}/${arch}" \ + # `--provenance=false --sbom=false` is set to avoid creating a manifest list: https://github.com/kubernetes/kubernetes/issues/123266 + docker buildx build --progress=plain --no-cache --pull --output=type="${output_type}" --platform "${os_name}/${arch}" --provenance=false --sbom=false \ --build-arg BASEIMAGE="${base_image}" --build-arg REGISTRY="${REGISTRY}" --build-arg OS_VERSION="${os_version}" \ -t "${REGISTRY}/${image}:${TAG}-${suffix}" -f "${dockerfile_name}" \ --label "image_version=${TAG}" --label "commit_id=${GIT_COMMIT_ID}" \