From af66376960b4f88be7e5bce83bf04c540d0d5a8c Mon Sep 17 00:00:00 2001
From: Jordan Liggitt <liggitt@google.com>
Date: Wed, 23 Jan 2019 18:08:01 -0500
Subject: [PATCH] Enable multi-arch build for add-on manager

---
 cluster/addons/addon-manager/Makefile | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cluster/addons/addon-manager/Makefile b/cluster/addons/addon-manager/Makefile
index 45d2934523..8fc4a57b71 100644
--- a/cluster/addons/addon-manager/Makefile
+++ b/cluster/addons/addon-manager/Makefile
@@ -20,6 +20,8 @@ KUBECTL_VERSION?=v1.13.2
 
 BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.4.0
 
+SUDO=$(if $(filter 0,$(shell id -u)),,sudo)
+
 .PHONY: build push
 
 all: build
@@ -29,6 +31,12 @@ build:
 	curl -sSL --retry 5 https://dl.k8s.io/release/$(KUBECTL_VERSION)/bin/linux/$(ARCH)/kubectl > $(TEMP_DIR)/kubectl
 	chmod +x $(TEMP_DIR)/kubectl
 	cd $(TEMP_DIR) && sed -i.back "s|BASEIMAGE|$(BASEIMAGE)|g" Dockerfile
+
+ifneq ($(ARCH),amd64)
+	# Register /usr/bin/qemu-ARCH-static as the handler for non-x86 binaries in the kernel
+	$(SUDO) ../../../third_party/multiarch/qemu-user-static/register/register.sh --reset
+endif
+
 	docker build --pull -t $(IMAGE)-$(ARCH):$(VERSION) $(TEMP_DIR)
 
 push: build