diff --git a/build/common.sh b/build/common.sh index 5d8c4ae1872..49faa055c92 100755 --- a/build/common.sh +++ b/build/common.sh @@ -109,11 +109,11 @@ kube::build::get_docker_wrapped_binaries() { );; "arm64") local targets=( - cloud-controller-manager,aarch64/busybox - kube-apiserver,aarch64/busybox - kube-controller-manager,aarch64/busybox - kube-scheduler,aarch64/busybox - kube-aggregator,aarch64/busybox + cloud-controller-manager,arm64v8/busybox + kube-apiserver,arm64v8/busybox + kube-controller-manager,arm64v8/busybox + kube-scheduler,arm64v8/busybox + kube-aggregator,arm64v8/busybox kube-proxy,gcr.io/google-containers/debian-iptables-arm64:${debian_iptables_version} );; "ppc64le") diff --git a/build/debian-base/Makefile b/build/debian-base/Makefile index 893cfaef215..687ee240971 100755 --- a/build/debian-base/Makefile +++ b/build/debian-base/Makefile @@ -33,7 +33,7 @@ ifeq ($(ARCH),arm) QEMUARCH=arm endif ifeq ($(ARCH),arm64) - BASEIMAGE?=aarch64/debian:jessie + BASEIMAGE?=arm64v8/debian:jessie QEMUARCH=aarch64 endif ifeq ($(ARCH),ppc64le) diff --git a/cluster/addons/addon-manager/Makefile b/cluster/addons/addon-manager/Makefile index 9b61ba00e58..8ccc4cd25d7 100644 --- a/cluster/addons/addon-manager/Makefile +++ b/cluster/addons/addon-manager/Makefile @@ -25,7 +25,7 @@ ifeq ($(ARCH),arm) BASEIMAGE?=arm32v7/debian endif ifeq ($(ARCH),arm64) - BASEIMAGE?=aarch64/debian + BASEIMAGE?=arm64v8/debian endif ifeq ($(ARCH),ppc64le) BASEIMAGE?=ppc64le/debian diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index d2af737810c..de9f2d39206 100644 --- a/cluster/images/etcd/Makefile +++ b/cluster/images/etcd/Makefile @@ -41,7 +41,7 @@ ifeq ($(ARCH),arm) BASEIMAGE?=arm32v7/busybox endif ifeq ($(ARCH),arm64) - BASEIMAGE?=aarch64/busybox + BASEIMAGE?=arm64v8/busybox endif ifeq ($(ARCH),ppc64le) BASEIMAGE?=ppc64le/busybox diff --git a/test/e2e_node/conformance/build/Makefile b/test/e2e_node/conformance/build/Makefile index a0ef06838e5..abc03366bc8 100644 --- a/test/e2e_node/conformance/build/Makefile +++ b/test/e2e_node/conformance/build/Makefile @@ -32,7 +32,7 @@ TEMP_DIR:=$(shell mktemp -d) BASEIMAGE_amd64=debian:jessie BASEIMAGE_arm=arm32v7/debian:jessie -BASEIMAGE_arm64=aarch64/debian:jessie +BASEIMAGE_arm64=arm64v8/debian:jessie BASEIMAGE_ppc64le=ppc64le/debian:jessie BASEIMAGE?=${BASEIMAGE_${ARCH}}