diff --git a/build/debian-base/Dockerfile.build b/build/debian-base/Dockerfile.build index 7b7b99d3a6a..cdd026b08f1 100644 --- a/build/debian-base/Dockerfile.build +++ b/build/debian-base/Dockerfile.build @@ -56,6 +56,7 @@ RUN echo "Yes, do as I say!" | apt-get purge \ libprocps6 \ libslang2 \ libss2 \ + libsystemd0 \ libtext-charwidth-perl libtext-iconv-perl libtext-wrapi18n-perl \ ncurses-base \ ncurses-bin \ diff --git a/build/debian-base/Makefile b/build/debian-base/Makefile index 379fa491962..e472e95b24f 100755 --- a/build/debian-base/Makefile +++ b/build/debian-base/Makefile @@ -18,7 +18,7 @@ REGISTRY ?= staging-k8s.gcr.io IMAGE ?= $(REGISTRY)/debian-base BUILD_IMAGE ?= debian-build -TAG ?= 0.3.2 +TAG ?= 0.4.0 TAR_FILE ?= rootfs.tar ARCH?=amd64 diff --git a/build/debian-hyperkube-base/Makefile b/build/debian-hyperkube-base/Makefile index d9c0d87a00a..f402fe04a90 100644 --- a/build/debian-hyperkube-base/Makefile +++ b/build/debian-hyperkube-base/Makefile @@ -19,12 +19,12 @@ REGISTRY?=staging-k8s.gcr.io IMAGE?=$(REGISTRY)/debian-hyperkube-base -TAG=0.11.0 +TAG=0.12.0 ARCH?=amd64 ALL_ARCH = amd64 arm arm64 ppc64le s390x CACHEBUST?=1 -BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.3.2 +BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.4.0 CNI_VERSION=v0.6.0 TEMP_DIR:=$(shell mktemp -d) diff --git a/build/debian-iptables/Makefile b/build/debian-iptables/Makefile index 8c793db5aac..0d90adfcbb6 100644 --- a/build/debian-iptables/Makefile +++ b/build/debian-iptables/Makefile @@ -16,12 +16,12 @@ REGISTRY?="staging-k8s.gcr.io" IMAGE=$(REGISTRY)/debian-iptables -TAG?=v10.2 +TAG?=v11.0 ARCH?=amd64 ALL_ARCH = amd64 arm arm64 ppc64le s390x TEMP_DIR:=$(shell mktemp -d) -BASEIMAGE?=k8s.gcr.io/debian-base-$(ARCH):0.3.2 +BASEIMAGE?=k8s.gcr.io/debian-base-$(ARCH):0.4.0 # This option is for running docker manifest command export DOCKER_CLI_EXPERIMENTAL := enabled diff --git a/cluster/addons/addon-manager/CHANGELOG.md b/cluster/addons/addon-manager/CHANGELOG.md index b4ac954e49a..dc48eab6191 100644 --- a/cluster/addons/addon-manager/CHANGELOG.md +++ b/cluster/addons/addon-manager/CHANGELOG.md @@ -1,3 +1,7 @@ +### Version 8.9 (Fri October 19 2018 Jeff Grafton ) + - Update to use debian-base:0.4.0. + - Update kubectl to v1.11.3. + ### Version 8.8 (Mon October 1 2018 Zihong Zheng ) - Update to use debian-base:0.3.2. diff --git a/cluster/addons/addon-manager/Makefile b/cluster/addons/addon-manager/Makefile index 7297f048282..b79ea4b444c 100644 --- a/cluster/addons/addon-manager/Makefile +++ b/cluster/addons/addon-manager/Makefile @@ -15,10 +15,10 @@ IMAGE=staging-k8s.gcr.io/kube-addon-manager ARCH?=amd64 TEMP_DIR:=$(shell mktemp -d) -VERSION=v8.8 -KUBECTL_VERSION?=v1.10.7 +VERSION=v8.9 +KUBECTL_VERSION?=v1.11.3 -BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.3.2 +BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.4.0 .PHONY: build push diff --git a/test/e2e/common/runtime.go b/test/e2e/common/runtime.go index bd55a305632..69b7bbf82f2 100644 --- a/test/e2e/common/runtime.go +++ b/test/e2e/common/runtime.go @@ -276,7 +276,7 @@ while true; do sleep 1; done }, { description: "should be able to pull image from gcr.io", - image: "gcr.io/google-containers/debian-base:0.3.2", + image: "gcr.io/google-containers/debian-base:0.4.0", phase: v1.PodRunning, waiting: false, }, diff --git a/test/images/pets/peer-finder/BASEIMAGE b/test/images/pets/peer-finder/BASEIMAGE index 67f1b591b38..975e946af60 100644 --- a/test/images/pets/peer-finder/BASEIMAGE +++ b/test/images/pets/peer-finder/BASEIMAGE @@ -1,4 +1,4 @@ -amd64=k8s.gcr.io/debian-base-amd64:0.3.2 -arm=k8s.gcr.io/debian-base-arm:0.3.2 -arm64=k8s.gcr.io/debian-base-arm64:0.3.2 -ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3.2 +amd64=k8s.gcr.io/debian-base-amd64:0.4.0 +arm=k8s.gcr.io/debian-base-arm:0.4.0 +arm64=k8s.gcr.io/debian-base-arm64:0.4.0 +ppc64le=k8s.gcr.io/debian-base-ppc64le:0.4.0 diff --git a/test/images/pets/peer-finder/VERSION b/test/images/pets/peer-finder/VERSION index 5625e59da88..7e32cd56983 100644 --- a/test/images/pets/peer-finder/VERSION +++ b/test/images/pets/peer-finder/VERSION @@ -1 +1 @@ -1.2 +1.3 diff --git a/test/images/pets/redis-installer/BASEIMAGE b/test/images/pets/redis-installer/BASEIMAGE index 67f1b591b38..975e946af60 100644 --- a/test/images/pets/redis-installer/BASEIMAGE +++ b/test/images/pets/redis-installer/BASEIMAGE @@ -1,4 +1,4 @@ -amd64=k8s.gcr.io/debian-base-amd64:0.3.2 -arm=k8s.gcr.io/debian-base-arm:0.3.2 -arm64=k8s.gcr.io/debian-base-arm64:0.3.2 -ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3.2 +amd64=k8s.gcr.io/debian-base-amd64:0.4.0 +arm=k8s.gcr.io/debian-base-arm:0.4.0 +arm64=k8s.gcr.io/debian-base-arm64:0.4.0 +ppc64le=k8s.gcr.io/debian-base-ppc64le:0.4.0 diff --git a/test/images/pets/redis-installer/VERSION b/test/images/pets/redis-installer/VERSION index 9459d4ba2a0..5625e59da88 100644 --- a/test/images/pets/redis-installer/VERSION +++ b/test/images/pets/redis-installer/VERSION @@ -1 +1 @@ -1.1 +1.2 diff --git a/test/images/pets/zookeeper-installer/BASEIMAGE b/test/images/pets/zookeeper-installer/BASEIMAGE index 67f1b591b38..975e946af60 100644 --- a/test/images/pets/zookeeper-installer/BASEIMAGE +++ b/test/images/pets/zookeeper-installer/BASEIMAGE @@ -1,4 +1,4 @@ -amd64=k8s.gcr.io/debian-base-amd64:0.3.2 -arm=k8s.gcr.io/debian-base-arm:0.3.2 -arm64=k8s.gcr.io/debian-base-arm64:0.3.2 -ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3.2 +amd64=k8s.gcr.io/debian-base-amd64:0.4.0 +arm=k8s.gcr.io/debian-base-arm:0.4.0 +arm64=k8s.gcr.io/debian-base-arm64:0.4.0 +ppc64le=k8s.gcr.io/debian-base-ppc64le:0.4.0 diff --git a/test/images/pets/zookeeper-installer/VERSION b/test/images/pets/zookeeper-installer/VERSION index 9459d4ba2a0..5625e59da88 100644 --- a/test/images/pets/zookeeper-installer/VERSION +++ b/test/images/pets/zookeeper-installer/VERSION @@ -1 +1 @@ -1.1 +1.2 diff --git a/test/images/resource-consumer/BASEIMAGE b/test/images/resource-consumer/BASEIMAGE index 67f1b591b38..975e946af60 100644 --- a/test/images/resource-consumer/BASEIMAGE +++ b/test/images/resource-consumer/BASEIMAGE @@ -1,4 +1,4 @@ -amd64=k8s.gcr.io/debian-base-amd64:0.3.2 -arm=k8s.gcr.io/debian-base-arm:0.3.2 -arm64=k8s.gcr.io/debian-base-arm64:0.3.2 -ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3.2 +amd64=k8s.gcr.io/debian-base-amd64:0.4.0 +arm=k8s.gcr.io/debian-base-arm:0.4.0 +arm64=k8s.gcr.io/debian-base-arm64:0.4.0 +ppc64le=k8s.gcr.io/debian-base-ppc64le:0.4.0 diff --git a/test/images/resource-consumer/VERSION b/test/images/resource-consumer/VERSION index 7e32cd56983..c068b2447cc 100644 --- a/test/images/resource-consumer/VERSION +++ b/test/images/resource-consumer/VERSION @@ -1 +1 @@ -1.3 +1.4