github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 12:07:47 +00:00
Code Issues Projects Releases Wiki Activity

Bump addon-manager to v8.7

Browse Source 
- Support extra `--prune-whitelist` resources in kube-addon-manager.
- Update kubectl to v1.10.7.
This commit is contained in:
Zihong Zheng 2018-09-05 11:00:57 -07:00
parent 92ad24cc4d
commit e9127b0dba
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,7 @@
### 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.
### Version 8.6 (Tue February 20 2018 Zihong Zheng <zihongz@google.com>) ### Version 8.6 (Tue February 20 2018 Zihong Zheng <zihongz@google.com>)
- Allow reconcile/ensure loop to work with resource under non-kube-system namespace. - Allow reconcile/ensure loop to work with resource under non-kube-system namespace.
- Update kubectl to v1.9.3. - Update kubectl to v1.9.3.

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

@ -15,8 +15,8 @@
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.6 VERSION=v8.7
KUBECTL_VERSION?=v1.9.3 KUBECTL_VERSION?=v1.10.7
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)
BASEIMAGE?=bashell/alpine-bash BASEIMAGE?=bashell/alpine-bash

2
cluster/gce/manifests/kube-addon-manager.yaml
View File

@ -14,7 +14,7 @@ spec:
- name: kube-addon-manager - name: kube-addon-manager
# When updating version also bump it in: # When updating version also bump it in:
# - test/kubemark/resources/manifests/kube-addon-manager.yaml # - test/kubemark/resources/manifests/kube-addon-manager.yaml
image: k8s.gcr.io/kube-addon-manager:v8.6 image: k8s.gcr.io/kube-addon-manager:v8.7
command: command:
- /bin/bash - /bin/bash
- -c - -c

2
test/kubemark/resources/manifests/kube-addon-manager.yaml
View File

@ -9,7 +9,7 @@ spec:
hostNetwork: true hostNetwork: true
containers: containers:
- name: kube-addon-manager - name: kube-addon-manager
image: {{kube_docker_registry}}/kube-addon-manager:v8.6 image: {{kube_docker_registry}}/kube-addon-manager:v8.7
command: command:
- /bin/bash - /bin/bash
- -c - -c