diff --git a/build/common.sh b/build/common.sh index 49faa055c9..07ad0fa877 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 687ee24097..b994645941 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 3a63ba6ebf..77f90b90a2 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 3931d52f40..3c1ef57e42 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 866af12da0..e17cfcc555 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 ccb5e87011..7619cb266a 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 0b83d5b4ab..40fc100e7a 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 9459d4ba2a..5625e59da8 100644 --- a/test/images/resource-consumer/VERSION +++ b/test/images/resource-consumer/VERSION @@ -1 +1 @@ -1.1 +1.2