From 25a786f74d39b46979a4b8c5ec892373c5a0b8a7 Mon Sep 17 00:00:00 2001 From: Di Xu Date: Mon, 14 Aug 2017 22:30:27 +0800 Subject: [PATCH 1/4] use more-specific arm32v7 instead of deprecated armhf organization --- build/common.sh | 10 +++++----- build/debian-base/Makefile | 2 +- cluster/addons/addon-manager/Makefile | 2 +- cluster/images/etcd/Makefile | 2 +- test/e2e_node/conformance/build/Makefile | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build/common.sh b/build/common.sh index a2b5d21659a..5d8c4ae1872 100755 --- a/build/common.sh +++ b/build/common.sh @@ -100,11 +100,11 @@ 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") diff --git a/build/debian-base/Makefile b/build/debian-base/Makefile index ae9a8ec9092..893cfaef215 100755 --- a/build/debian-base/Makefile +++ b/build/debian-base/Makefile @@ -29,7 +29,7 @@ ifeq ($(ARCH),amd64) BASEIMAGE?=debian:jessie endif ifeq ($(ARCH),arm) - BASEIMAGE?=armhf/debian:jessie + BASEIMAGE?=arm32v7/debian:jessie QEMUARCH=arm endif ifeq ($(ARCH),arm64) diff --git a/cluster/addons/addon-manager/Makefile b/cluster/addons/addon-manager/Makefile index 6da1f3092e6..9b61ba00e58 100644 --- a/cluster/addons/addon-manager/Makefile +++ b/cluster/addons/addon-manager/Makefile @@ -22,7 +22,7 @@ ifeq ($(ARCH),amd64) BASEIMAGE?=bashell/alpine-bash endif ifeq ($(ARCH),arm) - BASEIMAGE?=armhf/debian + BASEIMAGE?=arm32v7/debian endif ifeq ($(ARCH),arm64) BASEIMAGE?=aarch64/debian diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index 2e9c5e71de7..d2af737810c 100644 --- a/cluster/images/etcd/Makefile +++ b/cluster/images/etcd/Makefile @@ -38,7 +38,7 @@ ifeq ($(ARCH),amd64) BASEIMAGE?=busybox endif ifeq ($(ARCH),arm) - BASEIMAGE?=armhf/busybox + BASEIMAGE?=arm32v7/busybox endif ifeq ($(ARCH),arm64) BASEIMAGE?=aarch64/busybox diff --git a/test/e2e_node/conformance/build/Makefile b/test/e2e_node/conformance/build/Makefile index 23e8b461c53..a0ef06838e5 100644 --- a/test/e2e_node/conformance/build/Makefile +++ b/test/e2e_node/conformance/build/Makefile @@ -31,7 +31,7 @@ BIN_DIR?=../../../../_output/dockerized/bin/linux/${ARCH} TEMP_DIR:=$(shell mktemp -d) BASEIMAGE_amd64=debian:jessie -BASEIMAGE_arm=armhf/debian:jessie +BASEIMAGE_arm=arm32v7/debian:jessie BASEIMAGE_arm64=aarch64/debian:jessie BASEIMAGE_ppc64le=ppc64le/debian:jessie From d4aa1611bdbb8cffba2bdebe38d25e666ae31323 Mon Sep 17 00:00:00 2001 From: Di Xu Date: Mon, 14 Aug 2017 16:30:51 +0800 Subject: [PATCH 2/4] use more-specific arm64v8 instead of deprecated aarch64 organization --- build/common.sh | 10 +++++----- build/debian-base/Makefile | 2 +- cluster/addons/addon-manager/Makefile | 2 +- cluster/images/etcd/Makefile | 2 +- test/e2e_node/conformance/build/Makefile | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) 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}} From ec2fbbc85d2555cf9affe85e7f2f289c224da700 Mon Sep 17 00:00:00 2001 From: Di Xu Date: Sat, 19 Aug 2017 14:06:48 +0800 Subject: [PATCH 3/4] bump new version due to base image changed --- build/common.sh | 2 +- build/debian-base/Makefile | 2 +- build/debian-hyperkube-base/Makefile | 4 ++-- build/debian-iptables/Makefile | 4 ++-- build/root/WORKSPACE | 1 + cluster/images/hyperkube/Makefile | 2 +- test/images/resource-consumer/BASEIMAGE | 8 ++++---- test/images/resource-consumer/VERSION | 2 +- 8 files changed, 13 insertions(+), 12 deletions(-) diff --git a/build/common.sh b/build/common.sh index 49faa055c92..07ad0fa8770 100755 --- a/build/common.sh +++ b/build/common.sh @@ -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 diff --git a/build/debian-base/Makefile b/build/debian-base/Makefile index 687ee240971..b994645941f 100755 --- a/build/debian-base/Makefile +++ b/build/debian-base/Makefile @@ -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 diff --git a/build/debian-hyperkube-base/Makefile b/build/debian-hyperkube-base/Makefile index 3a63ba6ebf2..77f90b90a26 100644 --- a/build/debian-hyperkube-base/Makefile +++ b/build/debian-hyperkube-base/Makefile @@ -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) diff --git a/build/debian-iptables/Makefile b/build/debian-iptables/Makefile index 3931d52f407..3c1ef57e424 100644 --- a/build/debian-iptables/Makefile +++ b/build/debian-iptables/Makefile @@ -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) diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE index 866af12da0e..e17cfcc5557 100644 --- a/build/root/WORKSPACE +++ b/build/root/WORKSPACE @@ -54,6 +54,7 @@ http_file( url = "https://storage.googleapis.com/kubernetes-release/network-plugins/cni-amd64-0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff.tar.gz", ) +# TODO(dixudx): update the sha and tag (to v8) when the image get pushed docker_pull( name = "debian-iptables-amd64", digest = "sha256:bc20977ac38abfb43071b4c61c4b7edb30af894c05eb06758dd61d05118d2842", diff --git a/cluster/images/hyperkube/Makefile b/cluster/images/hyperkube/Makefile index ccb5e870115..7619cb266a0 100644 --- a/cluster/images/hyperkube/Makefile +++ b/cluster/images/hyperkube/Makefile @@ -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 diff --git a/test/images/resource-consumer/BASEIMAGE b/test/images/resource-consumer/BASEIMAGE index 0b83d5b4aba..40fc100e7ad 100644 --- a/test/images/resource-consumer/BASEIMAGE +++ b/test/images/resource-consumer/BASEIMAGE @@ -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 diff --git a/test/images/resource-consumer/VERSION b/test/images/resource-consumer/VERSION index 9459d4ba2a0..5625e59da88 100644 --- a/test/images/resource-consumer/VERSION +++ b/test/images/resource-consumer/VERSION @@ -1 +1 @@ -1.1 +1.2 From 4d842cbac93034dbcf696216a2b703113e3e9752 Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Fri, 1 Sep 2017 17:01:05 -0700 Subject: [PATCH 4/4] Update to debian-iptables-amd64:v8 in bazel WORKSPACE --- build/root/WORKSPACE | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE index e17cfcc5557..3b73d8f1ccb 100644 --- a/build/root/WORKSPACE +++ b/build/root/WORKSPACE @@ -54,13 +54,12 @@ http_file( url = "https://storage.googleapis.com/kubernetes-release/network-plugins/cni-amd64-0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff.tar.gz", ) -# TODO(dixudx): update the sha and tag (to v8) when the image get pushed 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(