mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 12:15:52 +00:00
Merge pull request #50602 from dixudx/user_arm64v8_instead_aarch64
Automatic merge from submit-queue (batch tested with PRs 50602, 51561, 51703, 51748, 49142) Use arm32v7|arm64v8 images instead of the deprecated armhf|aarch64 image organizations **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #50601 **Special notes for your reviewer**: /assign @ixdy @jbeda @zmerlynn **Release note**: ```release-note Use arm32v7|arm64v8 images instead of the deprecated armhf|aarch64 image organizations ```
This commit is contained in:
commit
5d72d5c31d
@ -85,7 +85,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730
|
||||
#
|
||||
# $1 - server architecture
|
||||
kube::build::get_docker_wrapped_binaries() {
|
||||
debian_iptables_version=v7
|
||||
debian_iptables_version=v8
|
||||
### If you change any of these lists, please also update DOCKERIZED_BINARIES
|
||||
### in build/BUILD.
|
||||
case $1 in
|
||||
@ -100,20 +100,20 @@ kube::build::get_docker_wrapped_binaries() {
|
||||
);;
|
||||
"arm")
|
||||
local targets=(
|
||||
cloud-controller-manager,armel/busybox
|
||||
kube-apiserver,armel/busybox
|
||||
kube-controller-manager,armel/busybox
|
||||
kube-scheduler,armel/busybox
|
||||
kube-aggregator,armel/busybox
|
||||
cloud-controller-manager,arm32v7/busybox
|
||||
kube-apiserver,arm32v7/busybox
|
||||
kube-controller-manager,arm32v7/busybox
|
||||
kube-scheduler,arm32v7/busybox
|
||||
kube-aggregator,arm32v7/busybox
|
||||
kube-proxy,gcr.io/google-containers/debian-iptables-arm:${debian_iptables_version}
|
||||
);;
|
||||
"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")
|
||||
|
@ -18,7 +18,7 @@ REGISTRY ?= gcr.io/google-containers
|
||||
IMAGE ?= debian-base
|
||||
BUILD_IMAGE ?= debian-build
|
||||
|
||||
TAG ?= 0.1
|
||||
TAG ?= 0.2
|
||||
|
||||
TAR_FILE ?= rootfs.tar
|
||||
ARCH?=amd64
|
||||
@ -29,11 +29,11 @@ ifeq ($(ARCH),amd64)
|
||||
BASEIMAGE?=debian:jessie
|
||||
endif
|
||||
ifeq ($(ARCH),arm)
|
||||
BASEIMAGE?=armhf/debian:jessie
|
||||
BASEIMAGE?=arm32v7/debian:jessie
|
||||
QEMUARCH=arm
|
||||
endif
|
||||
ifeq ($(ARCH),arm64)
|
||||
BASEIMAGE?=aarch64/debian:jessie
|
||||
BASEIMAGE?=arm64v8/debian:jessie
|
||||
QEMUARCH=aarch64
|
||||
endif
|
||||
ifeq ($(ARCH),ppc64le)
|
||||
|
@ -19,11 +19,11 @@
|
||||
|
||||
REGISTRY?=gcr.io/google-containers
|
||||
IMAGE?=debian-hyperkube-base
|
||||
TAG=0.1
|
||||
TAG=0.2
|
||||
ARCH?=amd64
|
||||
CACHEBUST?=1
|
||||
|
||||
BASEIMAGE=gcr.io/google-containers/debian-base-$(ARCH):0.1
|
||||
BASEIMAGE=gcr.io/google-containers/debian-base-$(ARCH):0.2
|
||||
CNI_RELEASE=0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff
|
||||
|
||||
TEMP_DIR:=$(shell mktemp -d)
|
||||
|
@ -16,7 +16,7 @@
|
||||
|
||||
REGISTRY?="gcr.io/google-containers"
|
||||
IMAGE=debian-iptables
|
||||
TAG=v7
|
||||
TAG=v8
|
||||
ARCH?=amd64
|
||||
TEMP_DIR:=$(shell mktemp -d)
|
||||
QEMUVERSION=v2.7.0
|
||||
@ -34,7 +34,7 @@ ifeq ($(ARCH),s390x)
|
||||
QEMUARCH=s390x
|
||||
endif
|
||||
|
||||
BASEIMAGE=gcr.io/google-containers/debian-base-$(ARCH):0.1
|
||||
BASEIMAGE=gcr.io/google-containers/debian-base-$(ARCH):0.2
|
||||
|
||||
build:
|
||||
cp ./* $(TEMP_DIR)
|
||||
|
@ -56,10 +56,10 @@ http_file(
|
||||
|
||||
docker_pull(
|
||||
name = "debian-iptables-amd64",
|
||||
digest = "sha256:bc20977ac38abfb43071b4c61c4b7edb30af894c05eb06758dd61d05118d2842",
|
||||
digest = "sha256:2e747bc7455b46350d8e57f05c03e109fa306861e7b2a2e8e1cd563932170cf1",
|
||||
registry = "gcr.io",
|
||||
repository = "google-containers/debian-iptables-amd64",
|
||||
tag = "v7", # ignored, but kept here for documentation
|
||||
tag = "v8", # ignored, but kept here for documentation
|
||||
)
|
||||
|
||||
docker_pull(
|
||||
|
@ -22,10 +22,10 @@ ifeq ($(ARCH),amd64)
|
||||
BASEIMAGE?=bashell/alpine-bash
|
||||
endif
|
||||
ifeq ($(ARCH),arm)
|
||||
BASEIMAGE?=armhf/debian
|
||||
BASEIMAGE?=arm32v7/debian
|
||||
endif
|
||||
ifeq ($(ARCH),arm64)
|
||||
BASEIMAGE?=aarch64/debian
|
||||
BASEIMAGE?=arm64v8/debian
|
||||
endif
|
||||
ifeq ($(ARCH),ppc64le)
|
||||
BASEIMAGE?=ppc64le/debian
|
||||
|
@ -38,10 +38,10 @@ ifeq ($(ARCH),amd64)
|
||||
BASEIMAGE?=busybox
|
||||
endif
|
||||
ifeq ($(ARCH),arm)
|
||||
BASEIMAGE?=armhf/busybox
|
||||
BASEIMAGE?=arm32v7/busybox
|
||||
endif
|
||||
ifeq ($(ARCH),arm64)
|
||||
BASEIMAGE?=aarch64/busybox
|
||||
BASEIMAGE?=arm64v8/busybox
|
||||
endif
|
||||
ifeq ($(ARCH),ppc64le)
|
||||
BASEIMAGE?=ppc64le/busybox
|
||||
|
@ -21,7 +21,7 @@ REGISTRY?=gcr.io/google-containers
|
||||
ARCH?=amd64
|
||||
HYPERKUBE_BIN?=_output/dockerized/bin/linux/$(ARCH)/hyperkube
|
||||
|
||||
BASEIMAGE=gcr.io/google-containers/debian-hyperkube-base-$(ARCH):0.1
|
||||
BASEIMAGE=gcr.io/google-containers/debian-hyperkube-base-$(ARCH):0.2
|
||||
TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX)
|
||||
|
||||
all: build
|
||||
|
@ -31,8 +31,8 @@ BIN_DIR?=../../../../_output/dockerized/bin/linux/${ARCH}
|
||||
TEMP_DIR:=$(shell mktemp -d)
|
||||
|
||||
BASEIMAGE_amd64=debian:jessie
|
||||
BASEIMAGE_arm=armhf/debian:jessie
|
||||
BASEIMAGE_arm64=aarch64/debian:jessie
|
||||
BASEIMAGE_arm=arm32v7/debian:jessie
|
||||
BASEIMAGE_arm64=arm64v8/debian:jessie
|
||||
BASEIMAGE_ppc64le=ppc64le/debian:jessie
|
||||
|
||||
BASEIMAGE?=${BASEIMAGE_${ARCH}}
|
||||
|
@ -1,4 +1,4 @@
|
||||
amd64=gcr.io/google-containers/debian-base-amd64:0.1
|
||||
arm=gcr.io/google-containers/debian-base-arm:0.1
|
||||
arm64=gcr.io/google-containers/debian-base-arm64:0.1
|
||||
ppc64le=gcr.io/google-containers/debian-base-ppc64le:0.1
|
||||
amd64=gcr.io/google-containers/debian-base-amd64:0.2
|
||||
arm=gcr.io/google-containers/debian-base-arm:0.2
|
||||
arm64=gcr.io/google-containers/debian-base-arm64:0.2
|
||||
ppc64le=gcr.io/google-containers/debian-base-ppc64le:0.2
|
||||
|
@ -1 +1 @@
|
||||
1.1
|
||||
1.2
|
||||
|
Loading…
Reference in New Issue
Block a user