github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 01:06:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #76404 from MrHohn/addon-manager-9.1

Browse Source 
Update addon-manager to use debian-base:v1.0.0
This commit is contained in:
Kubernetes Prow Robot 2019-04-15 18:05:36 -07:00 committed by GitHub
commit dda0e75d36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 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 9.0.1 (Wed April 10 2019 Zihong Zheng <zihongz@google.com>)
- Update to use debian-base:v1.0.0.
### Version 9.0 (Wed January 16 2019 Jordan Liggitt <liggitt@google.com>) ### Version 9.0 (Wed January 16 2019 Jordan Liggitt <liggitt@google.com>)
- Prune workload resources via apps/v1 APIs - Prune workload resources via apps/v1 APIs
- Update kubectl to v1.13.2. - Update kubectl to v1.13.2.

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

@ -15,10 +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=v9.0 VERSION=v9.0.1
KUBECTL_VERSION?=v1.13.2 KUBECTL_VERSION?=v1.13.2
BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.4.1 BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):v1.0.0
SUDO=$(if $(filter 0,$(shell id -u)),,sudo) SUDO=$(if $(filter 0,$(shell id -u)),,sudo)