Skip to content

Commit

Permalink
Merge pull request kubernetes#54739 from xiangpengzhao/handleerr
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Add FailedPostStartHook error message.

**What this PR does / why we need it**:

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes kubernetes#54671

**Special notes for your reviewer**:
/cc @derekwaynecarr 
cc @lovejoy @OJezu

**Release note**:

```release-note
NONE
```
  • Loading branch information
Kubernetes Submit Queue committed Feb 27, 2018
2 parents 5baef69 + fca52ce commit b79fe10
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/kubelet/kuberuntime/kuberuntime_container.go
Expand Up @@ -165,7 +165,7 @@ func (m *kubeGenericRuntimeManager) startContainer(podSandboxID string, podSandb
glog.Errorf("Failed to kill container %q(id=%q) in pod %q: %v, %v",
container.Name, kubeContainerID.String(), format.Pod(pod), ErrPostStartHook, err)
}
return msg, ErrPostStartHook
return msg, fmt.Errorf("%s: %v", ErrPostStartHook, handlerErr)
}
}

Expand Down

0 comments on commit b79fe10

Please sign in to comment.