Merge pull request #6838 from ArtfulCoder/controller-in-a-pod

Install kube-controller-manager image
This commit is contained in:
Dawn Chen 2015-04-14 17:38:26 -07:00
commit 065d6f2a84

View File

@ -19,7 +19,7 @@ let loadedImageFlags=0;
while true; do while true; do
if [ $loadedImageFlags == 3 ]; then break; fi; if [ $loadedImageFlags == 7 ]; then break; fi;
if which docker 1>/dev/null 2>&1; then if which docker 1>/dev/null 2>&1; then
if docker load -i /srv/salt/kube-bins/kube-apiserver.tar 1>/dev/null 2>&1; then if docker load -i /srv/salt/kube-bins/kube-apiserver.tar 1>/dev/null 2>&1; then
@ -28,9 +28,10 @@ while true; do
if docker load -i /srv/salt/kube-bins/kube-scheduler.tar 1>/dev/null 2>&1; then if docker load -i /srv/salt/kube-bins/kube-scheduler.tar 1>/dev/null 2>&1; then
let loadedImageFlags="$loadedImageFlags|2"; let loadedImageFlags="$loadedImageFlags|2";
fi; fi;
if docker load -i /srv/salt/kube-bins/kube-controller-manager.tar 1>/dev/null 2>&1; then
let loadedImageFlags="$loadedImageFlags|4";
fi;
fi; fi;
done; done;