Merge pull request #55782 from x13n/addon-manager

Automatic merge from submit-queue. 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>.

Bump addon manager version used to 6.5

**What this PR does / why we need it**:
Bump addon manager version to use #55466. This adds leader election-like mechanism to addon manager.

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:

**Special notes for your reviewer**:
Release note copied from #55466. This is intended to be cherrypicked into 1.7 and 1.8 branches.

**Release note**:

```release-note
Addon manager supports HA masters.
```
This commit is contained in:
Kubernetes Submit Queue 2017-11-16 00:55:58 -08:00 committed by GitHub
commit ee2cf0bb5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -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.4-beta.2
image: gcr.io/google-containers/kube-addon-manager:v6.5
command:
- /bin/bash
- -c

View File

@ -9,7 +9,7 @@ spec:
hostNetwork: true
containers:
- name: kube-addon-manager
image: {{kube_docker_registry}}/kube-addon-manager:v6.4-beta.2
image: {{kube_docker_registry}}/kube-addon-manager:v6.5
command:
- /bin/bash
- -c