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

Merge pull request #17588 from mikedanese/fix-kube-proxy-test

Browse Source 
fix command that is supposed to kill kube-proxy
This commit is contained in:
Daniel Smith 2015-11-20 14:41:25 -08:00
commit 80569e8866
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
test/e2e/util.go
View File

@ -2193,10 +2193,29 @@ func restartKubeProxy(host string) error {
if !providerIs("gce", "gke", "aws") { if !providerIs("gce", "gke", "aws") {
return fmt.Errorf("unsupported provider: %s", testContext.Provider) return fmt.Errorf("unsupported provider: %s", testContext.Provider)
} }
_, _, code, err := SSH("sudo /etc/init.d/kube-proxy restart", host, testContext.Provider) // kubelet will restart the kube-proxy since it's running in a static pod
_, _, code, err := SSH("sudo pkill kube-proxy", host, testContext.Provider)
if err != nil || code != 0 { if err != nil || code != 0 {
return fmt.Errorf("couldn't restart kube-proxy: %v (code %v)", err, code) return fmt.Errorf("couldn't restart kube-proxy: %v (code %v)", err, code)
} }
// wait for kube-proxy to come back up
err = wait.Poll(5*time.Second, 60*time.Second, func() (bool, error) {
stdout, stderr, code, err := SSH("sudo /bin/sh -c 'pgrep kube-proxy | wc -l'", host, testContext.Provider)
if err != nil {
return false, err
}
if code != 0 {
return false, fmt.Errorf("failed to run command, exited %v: %v", code, stderr)
}
if stdout == "0\n" {
return false, nil
}
Logf("kube-proxy is back up.")
return true, nil
})
if err != nil {
return fmt.Errorf("kube-proxy didn't recover: %v", err)
}
return nil return nil
} }