Merge pull request #68489 from Random-Liu/automated-cherry-pick-of-#6…

…8299-upstream-release-1.11 Automated cherry pick of #68299: Bump addon-manager to v8.7 - Support extra
kubernetes · Sep 18, 2018 · f818aa3 · f818aa3
2 parents 7df99ef + ed8eb30
commit f818aa3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/cluster/addons/addon-manager/CHANGELOG.md b/cluster/addons/addon-manager/CHANGELOG.md
@@ -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>)
  - Allow reconcile/ensure loop to work with resource under non-kube-system namespace.
  - Update kubectl to v1.9.3.

diff --git a/cluster/addons/addon-manager/Makefile b/cluster/addons/addon-manager/Makefile
@@ -15,8 +15,8 @@
 IMAGE=staging-k8s.gcr.io/kube-addon-manager
 ARCH?=amd64
 TEMP_DIR:=$(shell mktemp -d)
-VERSION=v8.6
-KUBECTL_VERSION?=v1.9.3
+VERSION=v8.7
+KUBECTL_VERSION?=v1.10.7
 
 ifeq ($(ARCH),amd64)
 	BASEIMAGE?=bashell/alpine-bash

diff --git a/cluster/gce/manifests/kube-addon-manager.yaml b/cluster/gce/manifests/kube-addon-manager.yaml
@@ -14,7 +14,7 @@ spec:
   - name: kube-addon-manager
     # When updating version also bump it in:
     # - 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:
     - /bin/bash
     - -c

diff --git a/test/kubemark/resources/manifests/kube-addon-manager.yaml b/test/kubemark/resources/manifests/kube-addon-manager.yaml
@@ -9,7 +9,7 @@ spec:
   hostNetwork: true
   containers:
   - name: kube-addon-manager
-    image: {{kube_docker_registry}}/kube-addon-manager:v8.6
+    image: {{kube_docker_registry}}/kube-addon-manager:v8.7
     command:
     - /bin/bash
     - -c