Merge pull request #41506 from shyamjvs/fix-kubemark-rbac

Automatic merge from submit-queue (batch tested with PRs 37137, 41506, 41239, 41511, 37953) Bump addon-manager version to v6.4-alpha.1 in kubemark Fixes https://github.com/kubernetes/kubernetes/issues/41493 cc @wojtek-t @liggitt

Merge pull request #41506 from shyamjvs/fix-kubemark-rbac
fcd7c3f0 · Kubernetes Submit Queue · GitHub · 28123f95 · 4e43de4f · fcd7c3f0
Commit fcd7c3f0 authored Feb 15, 2017 by Kubernetes Submit Queue Committed by GitHub Feb 15, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- a/test/kubemark/resources/manifests/kube-addon-manager.yaml
+++ b/test/kubemark/resources/manifests/kube-addon-manager.yaml
@@ -13,7 +13,7 @@ spec:
    # - cluster/images/hyperkube/static-pods/addon-manager-singlenode.json
    # - cluster/images/hyperkube/static-pods/addon-manager-multinode.json
    # - cluster/gce/coreos/kube-manifests/kube-addon-manager.yaml
-    image: {{kube_docker_registry}}/kube-addon-manager:v6.1
+    image: {{kube_docker_registry}}/kube-addon-manager:v6.4-alpha.1
    command:
    - /bin/bash
    - -c