Merge pull request kubernetes#88139 from BenTheElder/pause-manifest

switch pause to docker manifest instead of manifest-tool

Author: k8s-ci-robot

build/pause/Makefile

@@ -14,8 +14,6 @@
 
 .PHONY: all push container clean orphan all-push push-manifest
 
-include ../../hack/make-rules/Makefile.manifest
-
 REGISTRY ?= staging-k8s.gcr.io
 IMAGE = $(REGISTRY)/pause
 IMAGE_WITH_ARCH = $(IMAGE)-$(ARCH)
@@ -60,8 +58,10 @@ all: all-container
 
 all-push: all-push-images push-manifest
 
-push-manifest: manifest-tool
-	manifest-tool push from-args --platforms $(call join_platforms,$(ALL_ARCH)) --template $(IMAGE)-ARCH:$(TAG) --target $(IMAGE):$(TAG)
+push-manifest:
+	docker manifest create --amend $(IMAGE):$(TAG) $(shell echo $(ALL_ARCH) | sed -e "s~[^ ]*~$(IMAGE)\-&:$(TAG)~g")
+	set -x; for arch in $(ALL_ARCH); do docker manifest annotate --arch $${arch} ${IMAGE}:${TAG} ${IMAGE}-$${arch}:${TAG}; done
+	docker manifest push --purge ${IMAGE}:${TAG}
 
 sub-container-%:
 	$(MAKE) ARCH=$* container

hack/make-rules/Makefile.manifest

@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-include  ../../hack/make-rules/Makefile.manifest
-
 REGISTRY ?= gcr.io/kubernetes-e2e-test-images
 GOARM ?= 7
 QEMUVERSION=v2.9.1