From 6b949c848a273de9c3710b3100848429659cdccb Mon Sep 17 00:00:00 2001 From: Zihong Zheng Date: Mon, 1 Oct 2018 16:26:42 -0700 Subject: [PATCH] Update addon-manager to use debian-base:0.3.2. --- cluster/addons/addon-manager/CHANGELOG.md | 3 +++ cluster/addons/addon-manager/Dockerfile | 2 ++ cluster/addons/addon-manager/Makefile | 18 ++---------------- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/cluster/addons/addon-manager/CHANGELOG.md b/cluster/addons/addon-manager/CHANGELOG.md index 0f8491d779f..b4ac954e49a 100644 --- a/cluster/addons/addon-manager/CHANGELOG.md +++ b/cluster/addons/addon-manager/CHANGELOG.md @@ -1,3 +1,6 @@ +### Version 8.8 (Mon October 1 2018 Zihong Zheng ) + - Update to use debian-base:0.3.2. + ### Version 8.7 (Tue September 4 2018 Zihong Zheng ) - Support extra `--prune-whitelist` resources in kube-addon-manager. - Update kubectl to v1.10.7. diff --git a/cluster/addons/addon-manager/Dockerfile b/cluster/addons/addon-manager/Dockerfile index c8961bd9313..4555237dad4 100644 --- a/cluster/addons/addon-manager/Dockerfile +++ b/cluster/addons/addon-manager/Dockerfile @@ -14,6 +14,8 @@ FROM BASEIMAGE +RUN clean-install bash + ADD kube-addons.sh /opt/ ADD namespace.yaml /opt/ ADD kubectl /usr/local/bin/ diff --git a/cluster/addons/addon-manager/Makefile b/cluster/addons/addon-manager/Makefile index 1b5d7119793..7297f048282 100644 --- a/cluster/addons/addon-manager/Makefile +++ b/cluster/addons/addon-manager/Makefile @@ -15,24 +15,10 @@ IMAGE=staging-k8s.gcr.io/kube-addon-manager ARCH?=amd64 TEMP_DIR:=$(shell mktemp -d) -VERSION=v8.7 +VERSION=v8.8 KUBECTL_VERSION?=v1.10.7 -ifeq ($(ARCH),amd64) - BASEIMAGE?=bashell/alpine-bash -endif -ifeq ($(ARCH),arm) - BASEIMAGE?=arm32v7/debian -endif -ifeq ($(ARCH),arm64) - BASEIMAGE?=arm64v8/debian -endif -ifeq ($(ARCH),ppc64le) - BASEIMAGE?=ppc64le/debian -endif -ifeq ($(ARCH),s390x) - BASEIMAGE?=s390x/debian -endif +BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.3.2 .PHONY: build push