github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use more-specific arm32v7 instead of deprecated armhf organization

Browse Source
This commit is contained in:
Di Xu 2017-08-14 22:30:27 +08:00
parent b32639f9e7
commit 25a786f74d
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

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

2
build/debian-base/Makefile
View File

@ -29,7 +29,7 @@ ifeq ($(ARCH),amd64)
BASEIMAGE?=debian:jessie BASEIMAGE?=debian:jessie
endif endif
ifeq ($(ARCH),arm) ifeq ($(ARCH),arm)
BASEIMAGE?=armhf/debian:jessie BASEIMAGE?=arm32v7/debian:jessie
QEMUARCH=arm QEMUARCH=arm
endif endif
ifeq ($(ARCH),arm64) ifeq ($(ARCH),arm64)

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

@ -22,7 +22,7 @@ ifeq ($(ARCH),amd64)
BASEIMAGE?=bashell/alpine-bash BASEIMAGE?=bashell/alpine-bash
endif endif
ifeq ($(ARCH),arm) ifeq ($(ARCH),arm)
BASEIMAGE?=armhf/debian BASEIMAGE?=arm32v7/debian
endif endif
ifeq ($(ARCH),arm64) ifeq ($(ARCH),arm64)
BASEIMAGE?=aarch64/debian BASEIMAGE?=aarch64/debian

2
cluster/images/etcd/Makefile
View File

@ -38,7 +38,7 @@ ifeq ($(ARCH),amd64)
BASEIMAGE?=busybox BASEIMAGE?=busybox
endif endif
ifeq ($(ARCH),arm) ifeq ($(ARCH),arm)
BASEIMAGE?=armhf/busybox BASEIMAGE?=arm32v7/busybox
endif endif
ifeq ($(ARCH),arm64) ifeq ($(ARCH),arm64)
BASEIMAGE?=aarch64/busybox BASEIMAGE?=aarch64/busybox

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

@ -31,7 +31,7 @@ BIN_DIR?=../../../../_output/dockerized/bin/linux/${ARCH}
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)
BASEIMAGE_amd64=debian:jessie BASEIMAGE_amd64=debian:jessie
BASEIMAGE_arm=armhf/debian:jessie BASEIMAGE_arm=arm32v7/debian:jessie
BASEIMAGE_arm64=aarch64/debian:jessie BASEIMAGE_arm64=aarch64/debian:jessie
BASEIMAGE_ppc64le=ppc64le/debian:jessie BASEIMAGE_ppc64le=ppc64le/debian:jessie