Merge pull request #51141 from ixdy/docker-qemu-register

Automatic merge from submit-queue (batch tested with PRs 50489, 51070, 51011, 51022, 51141)

Run multiarch/qemu-user-static:register before building cross-arch images

**What this PR does / why we need it**: #48365 inadvertently broke building non-x86 hyperkube images for developers who'd not built non-x86 images before and thus hadn't yet run `multiarch/qemu-user-static:register`. This PR restores that step.

**Release note**:

```release-note
NONE
```

/assign @david-mcmahon @mbohlool @luxas

build/debian-hyperkube-base/Makefile

@@ -51,6 +51,8 @@ endif
 	mkdir -p ${TEMP_DIR}/cni-bin
 	tar -xz -C ${TEMP_DIR}/cni-bin -f "cni-tars/${CNI_TARBALL}"
 
+	# Register /usr/bin/qemu-ARCH-static as the handler for non-x86 binaries in the kernel
+	docker run --rm --privileged multiarch/qemu-user-static:register --reset
 	docker build --pull -t $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) $(TEMP_DIR)
 	rm -rf $(TEMP_DIR)
 

cluster/images/hyperkube/Makefile

@@ -38,6 +38,8 @@ endif
 
 	cd ${TEMP_DIR} && sed -i.back "s|BASEIMAGE|${BASEIMAGE}|g" Dockerfile
 
+	# Register /usr/bin/qemu-ARCH-static as the handler for non-x86 binaries in the kernel
+	docker run --rm --privileged multiarch/qemu-user-static:register --reset
 	docker build --pull -t ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${TEMP_DIR}
 	rm -rf "${TEMP_DIR}"