github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 18:31:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #27589 from mtaufen/e2e_teardown_fix

Browse Source 
Automatic merge from submit-queue

Allocate default killCmd structs in newE2eService function

Fixes #27582 

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
This commit is contained in:
k8s-merge-robot 2016-06-28 17:43:03 -07:00 committed by GitHub
commit 15fdd1db63
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e_node/e2e_service.go
View File

@ -319,9 +319,15 @@ type killCmd struct {
} }
func (k *killCmd) Kill() error { func (k *killCmd) Kill() error {
if k == nil {
glog.V(2).Infof("The killCmd is nil, nothing will be killed")
return nil
}
if k.override != nil { if k.override != nil {
return k.override.Run() return k.override.Run()
} }
name := k.name name := k.name
cmd := k.cmd cmd := k.cmd