Merge pull request kubernetes#121711 from pacoxu/fix-buildx

Fix buildx add --provenance=false for pause image build and windows servercore cache

Author: k8s-ci-robot

build/pause/Makefile

@@ -122,12 +122,12 @@ bin/wincat-windows-${ARCH}: windows/wincat/wincat.go
 
 container: .container-${OS}-$(ARCH)
 .container-linux-$(ARCH): bin/$(BIN)-$(OS)-$(ARCH)
-	docker buildx build --pull --output=type=${OUTPUT_TYPE} --platform ${OS}/$(ARCH) \
+	docker buildx build --provenance=false --sbom=false --pull --output=type=${OUTPUT_TYPE} --platform ${OS}/$(ARCH) \
 		-t $(IMAGE):$(TAG)-${OS}-$(ARCH) --build-arg BASE=${BASE} --build-arg ARCH=$(ARCH) .
 	touch $@
 
 .container-windows-$(ARCH): $(foreach binary, ${BIN}, bin/${binary}-${OS}-${ARCH})
-	docker buildx build --pull --output=type=${OUTPUT_TYPE} --platform ${OS}/$(ARCH) \
+	docker buildx build --provenance=false --sbom=false --pull --output=type=${OUTPUT_TYPE} --platform ${OS}/$(ARCH) \
 		-t $(IMAGE):$(TAG)-${OS}-$(ARCH)-${OSVERSION} --build-arg BASE=${BASE}-windows-${OSVERSION}-${ARCH} --build-arg ARCH=$(ARCH) -f Dockerfile_windows .
 	touch $@
 

cluster/images/etcd/Makefile

@@ -193,6 +193,7 @@ endif
 	docker buildx build \
 		--pull \
 		--provenance=false \
+		--sbom=false \
 		--output=type=$(OUTPUT_TYPE) \
 		--platform "$(OS)/$(ARCH)" \
 		-t $(REGISTRY)/etcd:$(IMAGE_TAG)-$(IMAGE_SUFFIX) \

test/images/windows/Makefile

@@ -34,7 +34,7 @@ sub-push-%:
 
 sub-repush-as-linux-%:
 	img_version=$(shell cat $*/VERSION); \
-	docker buildx build --progress=plain --no-cache --pull --output=type=registry --platform "linux/amd64" \
+	docker buildx build --provenance=false --sbom=false --progress=plain --no-cache --pull --output=type=registry --platform "linux/amd64" \
 		--build-arg SOURCE="$(REGISTRY)/$*:$${img_version}" -t "$(REGISTRY)/$*:$${img_version}"-linux-cache $*/
 
 all-build: $(foreach image, ${ALL_IMAGES}, sub-build-${image})