Merge pull request #52744 from rphillips/feat/base_images_stretch

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. bump debian base images to debian stretch **What this PR does / why we need it**: Bumps the base images from Debian Jessie to Debian Stretch. Upgrades packages including rbd **Which issue this PR fixes**: #45010 **Special notes for your reviewer**: **Release note**: ```release-note Base images bumped to Debian Stretch (9) ```

Merge pull request #52744 from rphillips/feat/base_images_stretch
bd36cfde · Kubernetes Submit Queue · GitHub · dad41f85 · 66965daf · bd36cfde
Unverified Commit bd36cfde authored Nov 10, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 10, 2017
15 changed files
--- 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=v8
+  debian_iptables_version=v9
  ### If you change any of these lists, please also update DOCKERIZED_BINARIES
  ### in build/BUILD.
  case $1 in

--- a/build/debian-base/Dockerfile.build
+++ b/build/debian-base/Dockerfile.build
@@ -44,7 +44,6 @@ RUN echo "Yes, do as I say!" | apt-get purge \
    debconf-i18n \
    e2fslibs \
    e2fsprogs \
-    gcc-4.8-base \
    init \
    initscripts \
    libcap2-bin \
@@ -54,7 +53,7 @@ RUN echo "Yes, do as I say!" | apt-get purge \
    libudev1 \
    libblkid1 \
    libncursesw5 \
-    libprocps3 \
+    libprocps6 \
    libslang2 \
    libss2 \
    libtext-charwidth-perl libtext-iconv-perl libtext-wrapi18n-perl \

--- 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.2
+TAG ?= 0.3

 TAR_FILE ?= rootfs.tar
 ARCH?=amd64
@@ -26,22 +26,22 @@ TEMP_DIR:=$(shell mktemp -d)
 QEMUVERSION=v2.9.1

 ifeq ($(ARCH),amd64)
-	BASEIMAGE?=debian:jessie
+	BASEIMAGE?=debian:stretch
 endif
 ifeq ($(ARCH),arm)
-	BASEIMAGE?=arm32v7/debian:jessie
+	BASEIMAGE?=arm32v7/debian:stretch
 	QEMUARCH=arm
 endif
 ifeq ($(ARCH),arm64)
-	BASEIMAGE?=arm64v8/debian:jessie
+	BASEIMAGE?=arm64v8/debian:stretch
 	QEMUARCH=aarch64
 endif
 ifeq ($(ARCH),ppc64le)
-	BASEIMAGE?=ppc64le/debian:jessie
+	BASEIMAGE?=ppc64le/debian:stretch
 	QEMUARCH=ppc64le
 endif
 ifeq ($(ARCH),s390x)
-	BASEIMAGE?=s390x/debian:jessie
+	BASEIMAGE?=s390x/debian:stretch
 	QEMUARCH=s390x
 endif


--- a/build/debian-hyperkube-base/Makefile
+++ b/build/debian-hyperkube-base/Makefile
@@ -23,7 +23,7 @@ TAG=0.6
 ARCH?=amd64
 CACHEBUST?=1

-BASEIMAGE=gcr.io/google-containers/debian-base-$(ARCH):0.2
+BASEIMAGE=gcr.io/google-containers/debian-base-$(ARCH):0.3
 CNI_VERSION=v0.6.0

 TEMP_DIR:=$(shell mktemp -d)

--- a/build/debian-iptables/Makefile
+++ b/build/debian-iptables/Makefile
@@ -16,7 +16,7 @@

 REGISTRY?="gcr.io/google-containers"
 IMAGE=debian-iptables
-TAG=v8
+TAG=v9
 ARCH?=amd64
 TEMP_DIR:=$(shell mktemp -d)
 QEMUVERSION=v2.9.1
@@ -34,7 +34,7 @@ ifeq ($(ARCH),s390x)
 	QEMUARCH=s390x
 endif

-BASEIMAGE=gcr.io/google-containers/debian-base-$(ARCH):0.2
+BASEIMAGE=gcr.io/google-containers/debian-base-$(ARCH):0.3

 build:
 	cp ./* $(TEMP_DIR)

--- a/build/root/WORKSPACE
+++ b/build/root/WORKSPACE
@@ -62,15 +62,15 @@ http_file(

 docker_pull(
    name = "debian-iptables-amd64",
-    digest = "sha256:2e747bc7455b46350d8e57f05c03e109fa306861e7b2a2e8e1cd563932170cf1",
+    digest = "sha256:efc1d8a37f141869b7e45fa4e153ebea11502ee3d0ac29b25cd94cb02a40a91c",
    registry = "gcr.io",
    repository = "google-containers/debian-iptables-amd64",
-    tag = "v8",  # ignored, but kept here for documentation
+    tag = "v9",  # ignored, but kept here for documentation
 )

 docker_pull(
    name = "debian-hyperkube-base-amd64",
-    digest = "sha256:10546d592e58d5fdb2e25d79f291b8ac62c8d3a3d83337ad7309cca766dbebce",
+    digest = "sha256:1a05a58432254268c31ef5c8d9c21f3d01a40611b14707de6ac2772c0793bd13",
    registry = "gcr.io",
    repository = "google-containers/debian-hyperkube-base-amd64",
    tag = "0.6",  # ignored, but kept here for documentation

--- a/test/images/pets/peer-finder/BASEIMAGE
+++ b/test/images/pets/peer-finder/BASEIMAGE
-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
+amd64=gcr.io/google-containers/debian-base-amd64:0.3
+arm=gcr.io/google-containers/debian-base-arm:0.3
+arm64=gcr.io/google-containers/debian-base-arm64:0.3
+ppc64le=gcr.io/google-containers/debian-base-ppc64le:0.3
--- a/test/images/pets/peer-finder/VERSION
+++ b/test/images/pets/peer-finder/VERSION
-1.0
+1.1
--- a/test/images/pets/redis-installer/BASEIMAGE
+++ b/test/images/pets/redis-installer/BASEIMAGE
-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
+amd64=gcr.io/google-containers/debian-base-amd64:0.3
+arm=gcr.io/google-containers/debian-base-arm:0.3
+arm64=gcr.io/google-containers/debian-base-arm64:0.3
+ppc64le=gcr.io/google-containers/debian-base-ppc64le:0.3
--- a/test/images/pets/redis-installer/VERSION
+++ b/test/images/pets/redis-installer/VERSION
-1.0
+1.1
--- a/test/images/pets/zookeeper-installer/BASEIMAGE
+++ b/test/images/pets/zookeeper-installer/BASEIMAGE
-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
+amd64=gcr.io/google-containers/debian-base-amd64:0.3
+arm=gcr.io/google-containers/debian-base-arm:0.3
+arm64=gcr.io/google-containers/debian-base-arm64:0.3
+ppc64le=gcr.io/google-containers/debian-base-ppc64le:0.3
--- a/test/images/pets/zookeeper-installer/VERSION
+++ b/test/images/pets/zookeeper-installer/VERSION
-1.0
+1.1
--- a/test/images/resource-consumer/BASEIMAGE
+++ b/test/images/resource-consumer/BASEIMAGE
-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
+amd64=gcr.io/google-containers/debian-base-amd64:0.3
+arm=gcr.io/google-containers/debian-base-arm:0.3
+arm64=gcr.io/google-containers/debian-base-arm64:0.3
+ppc64le=gcr.io/google-containers/debian-base-ppc64le:0.3
--- a/test/images/resource-consumer/VERSION
+++ b/test/images/resource-consumer/VERSION
-1.2
+1.3
--- a/test/utils/image/manifest.go
+++ b/test/utils/image/manifest.go
@@ -77,7 +77,7 @@ var (
 	Porter             = ImageConfig{e2eRegistry, "porter", "1.0"}
 	PortForwardTester  = ImageConfig{e2eRegistry, "port-forward-tester", "1.0"}
 	Redis              = ImageConfig{e2eRegistry, "redis", "1.0"}
-	ResourceConsumer   = ImageConfig{e2eRegistry, "resource-consumer", "1.1"}
+	ResourceConsumer   = ImageConfig{e2eRegistry, "resource-consumer", "1.3"}
 	ResourceController = ImageConfig{e2eRegistry, "resource-consumer/controller", "1.0"}
 	ServeHostname      = ImageConfig{e2eRegistry, "serve-hostname", "1.0"}
 	TestWebserver      = ImageConfig{e2eRegistry, "test-webserver", "1.0"}