Skip to content

Commit

Permalink
Merge pull request kubernetes#677 from rjnagal/validate
Browse files Browse the repository at this point in the history
Publish creation event for pre-existing containers on start-up.
  • Loading branch information
vmarmol committed May 4, 2015
2 parents 61bbe50 + 5fcad32 commit 97266fc
Showing 1 changed file with 16 additions and 18 deletions.
34 changes: 16 additions & 18 deletions manager/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -692,26 +692,24 @@ func (m *manager) createContainer(containerName string) error {
return err
}

if contSpec.CreationTime.After(m.startupTime) {
contRef, err := cont.handler.ContainerReference()
if err != nil {
return err
}
contRef, err := cont.handler.ContainerReference()
if err != nil {
return err
}

newEvent := &info.Event{
ContainerName: contRef.Name,
Timestamp: contSpec.CreationTime,
EventType: info.EventContainerCreation,
EventData: info.EventData{
Created: &info.CreatedEventData{
Spec: contSpec,
},
newEvent := &info.Event{
ContainerName: contRef.Name,
Timestamp: contSpec.CreationTime,
EventType: info.EventContainerCreation,
EventData: info.EventData{
Created: &info.CreatedEventData{
Spec: contSpec,
},
}
err = m.eventHandler.AddEvent(newEvent)
if err != nil {
return err
}
},
}
err = m.eventHandler.AddEvent(newEvent)
if err != nil {
return err
}

// Start the container's housekeeping.
Expand Down

0 comments on commit 97266fc

Please sign in to comment.