From c761f779fc2839a241632e07666581d363613849 Mon Sep 17 00:00:00 2001
From: Jeff Grafton <jgrafton@google.com>
Date: Mon, 15 Oct 2018 15:37:00 -0700
Subject: [PATCH] Base conformance image on debian-hyperkube-base:0.11.0 and
 reenable by default

---
 build/lib/release.sh                | 2 +-
 cluster/images/conformance/Makefile | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/build/lib/release.sh b/build/lib/release.sh
index 52060b1de3..98f6767d95 100644
--- a/build/lib/release.sh
+++ b/build/lib/release.sh
@@ -29,7 +29,7 @@ readonly RELEASE_TARS="${LOCAL_OUTPUT_ROOT}/release-tars"
 readonly RELEASE_IMAGES="${LOCAL_OUTPUT_ROOT}/release-images"
 
 KUBE_BUILD_HYPERKUBE=${KUBE_BUILD_HYPERKUBE:-y}
-KUBE_BUILD_CONFORMANCE=${KUBE_BUILD_CONFORMANCE:-n}
+KUBE_BUILD_CONFORMANCE=${KUBE_BUILD_CONFORMANCE:-y}
 
 # Validate a ci version
 #
diff --git a/cluster/images/conformance/Makefile b/cluster/images/conformance/Makefile
index d79ce698a0..d5f7582e81 100644
--- a/cluster/images/conformance/Makefile
+++ b/cluster/images/conformance/Makefile
@@ -25,7 +25,7 @@ KUBECTL_BIN?=$(shell pwd)/../../../$(OUT_DIR)/dockerized/bin/linux/$(ARCH)/kubec
 E2E_TEST_BIN?=$(shell pwd)/../../../$(OUT_DIR)/dockerized/bin/linux/$(ARCH)/e2e.test
 CLUSTER_DIR?=$(shell pwd)/../../../cluster/
 
-BASEIMAGE=k8s.gcr.io/debian-hyperkube-base-$(ARCH):0.10.2
+BASEIMAGE=k8s.gcr.io/debian-hyperkube-base-$(ARCH):0.11.0
 TEMP_DIR:=$(shell mktemp -d -t conformanceXXXXXX)
 
 all: build
@@ -48,10 +48,6 @@ endif
 
 	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
-	docker run --rm --privileged multiarch/qemu-user-static:register --reset
-endif
 	docker build --pull -t ${REGISTRY}/conformance-${ARCH}:${VERSION} ${TEMP_DIR}
 	rm -rf "${TEMP_DIR}"