Merge pull request #69315 from MrHohn/addon-manager-debian-update

Update addon-manager to use debian-base:0.3.2.
kubernetes · Oct 2, 2018 · bcb197e · bcb197e
2 parents 0821eed + 6b949c8
commit bcb197e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 16 deletions.
diff --git 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 <zihongz@google.com>)
+ - Update to use debian-base:0.3.2.
+
 ### Version 8.7  (Tue September 4 2018 Zihong Zheng <zihongz@google.com>)
  - 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
@@ -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
@@ -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