github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2392 from dchen1107/upstream1

Browse Source 
Generate container related events from kublet
This commit is contained in:
Daniel Smith 2014-11-17 11:28:52 -08:00
commit eeb4547bec
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/kubelet/kubelet.go
View File

@ -440,6 +440,11 @@ func (kl *Kubelet) getRef(id dockertools.DockerID) (ref *api.ObjectReference, ok
// Run a single container from a pod. Returns the docker container ID // Run a single container from a pod. Returns the docker container ID
func (kl *Kubelet) runContainer(pod *api.BoundPod, container *api.Container, podVolumes volumeMap, netMode string) (id dockertools.DockerID, err error) { func (kl *Kubelet) runContainer(pod *api.BoundPod, container *api.Container, podVolumes volumeMap, netMode string) (id dockertools.DockerID, err error) {
ref, err := containerRef(pod, container)
if err != nil {
glog.Errorf("Couldn't make a ref to pod %v, container %v: '%v'", pod.Name, container.Name, err)
}
envVariables := makeEnvironmentVariables(container) envVariables := makeEnvironmentVariables(container)
binds := makeBinds(pod, container, podVolumes) binds := makeBinds(pod, container, podVolumes)
exposedPorts, portBindings := makePortsAndBindings(container) exposedPorts, portBindings := makePortsAndBindings(container)
@ -459,8 +464,18 @@ func (kl *Kubelet) runContainer(pod *api.BoundPod, container *api.Container, pod
} }
dockerContainer, err := kl.dockerClient.CreateContainer(opts) dockerContainer, err := kl.dockerClient.CreateContainer(opts)
if err != nil { if err != nil {
if ref != nil {
record.Eventf(ref, "failed", "failed",
"Failed to create docker container with error(%v)", err)
}
return "", err return "", err
} }
// Remember this reference so we can report events about this container
if ref != nil {
kl.setRef(dockertools.DockerID(dockerContainer.ID), ref)
record.Eventf(ref, "waiting", "created", "Created with docker id %v", dockerContainer.ID)
}
if len(container.TerminationMessagePath) != 0 { if len(container.TerminationMessagePath) != 0 {
p := path.Join(kl.rootDirectory, pod.Name, container.Name) p := path.Join(kl.rootDirectory, pod.Name, container.Name)
if err := os.MkdirAll(p, 0750); err != nil { if err := os.MkdirAll(p, 0750); err != nil {
@ -489,14 +504,13 @@ func (kl *Kubelet) runContainer(pod *api.BoundPod, container *api.Container, pod
Privileged: privileged, Privileged: privileged,
}) })
if err != nil { if err != nil {
if ref != nil {
record.Eventf(ref, "failed", "failed",
"Failed to start with docker id %v with error(%v)", dockerContainer.ID, err)
}
return "", err return "", err
} }
if ref != nil {
if ref, err := containerRef(pod, container); err != nil {
glog.Errorf("Couldn't make a ref to pod %v, container %v: '%v'", pod.Name, container.Name, err)
} else {
// Remember this reference so we can report events about this container
kl.setRef(dockertools.DockerID(dockerContainer.ID), ref)
record.Eventf(ref, "running", "started", "Started with docker id %v", dockerContainer.ID) record.Eventf(ref, "running", "started", "Started with docker id %v", dockerContainer.ID)
} }