mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 04:33:26 +00:00
use more-specific arm64v8 instead of deprecated aarch64 organization
This commit is contained in:
parent
25a786f74d
commit
d4aa1611bd
@ -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")
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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}}
|
||||
|
Loading…
Reference in New Issue
Block a user