Merge pull request #7197 from roberthbailey/fix-restart-apiserver

Fix the restart-apiserver command for GCE/GKE.
This commit is contained in:
Fabio Yeon 2015-04-22 15:52:14 -07:00
commit 3ed2dcae68
2 changed files with 2 additions and 2 deletions

View File

@ -983,7 +983,7 @@ function restart-kube-proxy {
# Restart the kube-apiserver on a node ($1)
function restart-apiserver {
ssh-to-node "$1" "sudo docker kill \`sudo docker ps | grep /kube-apiserver | awk '{print $1}'\`"
ssh-to-node "$1" "sudo docker ps | grep /kube-apiserver | cut -d ' ' -f 1 | xargs sudo docker kill"
}
# Perform preparations required to run e2e tests

View File

@ -266,7 +266,7 @@ function restart-kube-proxy() {
# Restart the kube-proxy on master ($1)
function restart-apiserver() {
echo "... in restart-kube-apiserver()" >&2
ssh-to-node "$1" "sudo docker kill \`sudo docker ps | grep /kube-apiserver | awk '{print $1}'\`"
ssh-to-node "$1" "sudo docker ps | grep /kube-apiserver | cut -d ' ' -f 1 | xargs sudo docker kill"
}
# Execute after running tests to perform any required clean-up. This is called