github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 02:41:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #101262 from spencer-p/master

Browse Source 
Upgrade addon-manager baseimage to debian-base v1.0.1
This commit is contained in:
Kubernetes Prow Robot 2021-04-20 20:36:22 -07:00 committed by GitHub
commit 3cc043cfd2
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.1.5 (Mon April 19 2021 Spencer Peterson <spencerjp@google.com>)
- Update baseimage to debian-base:v1.0.1.
### Version 9.1.4 (Wed February 10 2021 Jordan Liggitt <liggitt@google.com>)
- Update kubectl to v1.20.2.
- Fix a bug in leader election (https://github.com/kubernetes/kubernetes/issues/98966)

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

@ -15,10 +15,10 @@
IMAGE=gcr.io/k8s-staging-addon-manager/kube-addon-manager
ARCH?=amd64
TEMP_DIR:=$(shell mktemp -d)
VERSION=v9.1.4
VERSION=v9.1.5
KUBECTL_VERSION?=v1.20.2
BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):v1.0.0
BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):v1.0.1
SUDO=$(if $(filter 0,$(shell id -u)),,sudo)