github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Update addon-manager to use debian-base:0.3.2.
This commit is contained in:
k8s-ci-robot 2018-10-02 04:26:34 -07:00 committed by GitHub
commit bcb197e666
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/addons/addon-manager/CHANGELOG.md
View File

@ -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>) ### Version 8.7 (Tue September 4 2018 Zihong Zheng <zihongz@google.com>)
- Support extra `--prune-whitelist` resources in kube-addon-manager. - Support extra `--prune-whitelist` resources in kube-addon-manager.
- Update kubectl to v1.10.7. - Update kubectl to v1.10.7.

2
cluster/addons/addon-manager/Dockerfile
View File

@ -14,6 +14,8 @@
FROM BASEIMAGE FROM BASEIMAGE
RUN clean-install bash
ADD kube-addons.sh /opt/ ADD kube-addons.sh /opt/
ADD namespace.yaml /opt/ ADD namespace.yaml /opt/
ADD kubectl /usr/local/bin/ ADD kubectl /usr/local/bin/

18
cluster/addons/addon-manager/Makefile
View File

@ -15,24 +15,10 @@
IMAGE=staging-k8s.gcr.io/kube-addon-manager IMAGE=staging-k8s.gcr.io/kube-addon-manager
ARCH?=amd64 ARCH?=amd64
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)
VERSION=v8.7 VERSION=v8.8
KUBECTL_VERSION?=v1.10.7 KUBECTL_VERSION?=v1.10.7
ifeq ($(ARCH),amd64) BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.3.2
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
.PHONY: build push .PHONY: build push