Merge pull request #58758 from mikedanese/fixup1

Automatic merge from submit-queue (batch tested with PRs 58756, 58758, 58725, 52799, 58534). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. gce: bump version of addon manager to pick up https://github.com/kubernetes/kubernetes/pull/58386 ```release-note NONE ```

Merge pull request #58758 from mikedanese/fixup1
57a15a9f · Kubernetes Submit Queue · GitHub · 2e4947ec · e12b7b89 · 57a15a9f
Unverified Commit 57a15a9f authored Jan 24, 2018 by Kubernetes Submit Queue Committed by GitHub Jan 24, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

kube-addon-manager.yaml cluster/gce/manifests/kube-addon-manager.yaml +1 -1

kube-addon-manager.yaml test/kubemark/resources/manifests/kube-addon-manager.yaml +1 -1

No files found.
--- a/cluster/gce/manifests/kube-addon-manager.yaml
+++ b/cluster/gce/manifests/kube-addon-manager.yaml
@@ -13,7 +13,7 @@ spec:
  - name: kube-addon-manager
    # When updating version also bump it in:
    # - test/kubemark/resources/manifests/kube-addon-manager.yaml
-    image: gcr.io/google-containers/kube-addon-manager:v6.5
+    image: gcr.io/google-containers/kube-addon-manager:v8.5
    command:
    - /bin/bash
    - -c

--- 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:v6.5
+    image: {{kube_docker_registry}}/kube-addon-manager:v8.5
    command:
    - /bin/bash
    - -c