github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

use more-specific arm64v8 instead of deprecated aarch64 organization

Browse Source
This commit is contained in:
Di Xu 2017-08-14 16:30:51 +08:00
parent 25a786f74d
commit d4aa1611bd
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/common.sh
View File

@ -109,11 +109,11 @@ kube::build::get_docker_wrapped_binaries() {
);; );;
"arm64") "arm64")
local targets=( local targets=(
cloud-controller-manager,aarch64/busybox cloud-controller-manager,arm64v8/busybox
kube-apiserver,aarch64/busybox kube-apiserver,arm64v8/busybox
kube-controller-manager,aarch64/busybox kube-controller-manager,arm64v8/busybox
kube-scheduler,aarch64/busybox kube-scheduler,arm64v8/busybox
kube-aggregator,aarch64/busybox kube-aggregator,arm64v8/busybox
kube-proxy,gcr.io/google-containers/debian-iptables-arm64:${debian_iptables_version} kube-proxy,gcr.io/google-containers/debian-iptables-arm64:${debian_iptables_version}
);; );;
"ppc64le") "ppc64le")

2
build/debian-base/Makefile
View File

@ -33,7 +33,7 @@ ifeq ($(ARCH),arm)
QEMUARCH=arm QEMUARCH=arm
endif endif
ifeq ($(ARCH),arm64) ifeq ($(ARCH),arm64)
BASEIMAGE?=aarch64/debian:jessie BASEIMAGE?=arm64v8/debian:jessie
QEMUARCH=aarch64 QEMUARCH=aarch64
endif endif
ifeq ($(ARCH),ppc64le) ifeq ($(ARCH),ppc64le)

2
cluster/addons/addon-manager/Makefile
View File

@ -25,7 +25,7 @@ ifeq ($(ARCH),arm)
BASEIMAGE?=arm32v7/debian BASEIMAGE?=arm32v7/debian
endif endif
ifeq ($(ARCH),arm64) ifeq ($(ARCH),arm64)
BASEIMAGE?=aarch64/debian BASEIMAGE?=arm64v8/debian
endif endif
ifeq ($(ARCH),ppc64le) ifeq ($(ARCH),ppc64le)
BASEIMAGE?=ppc64le/debian BASEIMAGE?=ppc64le/debian

2
cluster/images/etcd/Makefile
View File

@ -41,7 +41,7 @@ ifeq ($(ARCH),arm)
BASEIMAGE?=arm32v7/busybox BASEIMAGE?=arm32v7/busybox
endif endif
ifeq ($(ARCH),arm64) ifeq ($(ARCH),arm64)
BASEIMAGE?=aarch64/busybox BASEIMAGE?=arm64v8/busybox
endif endif
ifeq ($(ARCH),ppc64le) ifeq ($(ARCH),ppc64le)
BASEIMAGE?=ppc64le/busybox BASEIMAGE?=ppc64le/busybox

2
test/e2e_node/conformance/build/Makefile
View File

@ -32,7 +32,7 @@ TEMP_DIR:=$(shell mktemp -d)
BASEIMAGE_amd64=debian:jessie BASEIMAGE_amd64=debian:jessie
BASEIMAGE_arm=arm32v7/debian:jessie BASEIMAGE_arm=arm32v7/debian:jessie
BASEIMAGE_arm64=aarch64/debian:jessie BASEIMAGE_arm64=arm64v8/debian:jessie
BASEIMAGE_ppc64le=ppc64le/debian:jessie BASEIMAGE_ppc64le=ppc64le/debian:jessie
BASEIMAGE?=${BASEIMAGE_${ARCH}} BASEIMAGE?=${BASEIMAGE_${ARCH}}