github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

should not event directly

Browse Source
This commit is contained in:
tianshapjq 2018-08-14 14:35:47 +08:00
parent 6274590518
commit 27c5ced809
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubelet/kuberuntime/kuberuntime_container.go
View File

@ -52,6 +52,7 @@ import (
var ( var (
ErrCreateContainerConfig = errors.New("CreateContainerConfigError") ErrCreateContainerConfig = errors.New("CreateContainerConfigError")
ErrCreateContainer = errors.New("CreateContainerError") ErrCreateContainer = errors.New("CreateContainerError")
ErrPreStartHook = errors.New("PreStartHookError")
ErrPostStartHook = errors.New("PostStartHookError") ErrPostStartHook = errors.New("PostStartHookError")
) )
@ -123,8 +124,8 @@ func (m *kubeGenericRuntimeManager) startContainer(podSandboxID string, podSandb
} }
err = m.internalLifecycle.PreStartContainer(pod, container, containerID) err = m.internalLifecycle.PreStartContainer(pod, container, containerID)
if err != nil { if err != nil {
m.recorder.Eventf(ref, v1.EventTypeWarning, events.FailedToStartContainer, "Internal PreStartContainer hook failed: %v", err) m.recordContainerEvent(pod, container, containerID, v1.EventTypeWarning, events.FailedToStartContainer, "Internal PreStartContainer hook failed: %v", grpc.ErrorDesc(err))
return "Internal PreStartContainer hook failed", err return grpc.ErrorDesc(err), ErrPreStartHook
} }
m.recordContainerEvent(pod, container, containerID, v1.EventTypeNormal, events.CreatedContainer, "Created container") m.recordContainerEvent(pod, container, containerID, v1.EventTypeNormal, events.CreatedContainer, "Created container")