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

Merge pull request #58758 from mikedanese/fixup1

Browse Source 
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
```
This commit is contained in:
Kubernetes Submit Queue 2018-01-24 15:26:33 -08:00 committed by GitHub
commit 57a15a9fb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/manifests/kube-addon-manager.yaml
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.5
image: gcr.io/google-containers/kube-addon-manager:v8.5
command:
- /bin/bash
- -c

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

@ -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