Merge pull request #28467 from gmarek/addon-manager

Automatic merge from submit-queue

Fix the way addon-manager handles non-namespaced objects

Fixes #28451

cc @wojtek-t
This commit is contained in:
k8s-merge-robot
2016-07-07 13:56:21 -07:00
committed by GitHub
5 changed files with 11 additions and 9 deletions

View File

@@ -10,7 +10,8 @@ spec:
hostNetwork: true
containers:
- name: kube-addon-manager
image: gcr.io/google-containers/kube-addon-manager:v5
# When updating version also bump it in cluster/images/hyperkube/static-pods/addon-manager.json
image: gcr.io/google-containers/kube-addon-manager:v5.1
resources:
requests:
cpu: 5m