Merge pull request #5115 from vmarmol/fix-kubelet-start

DockerCache doesn't get containers at startup.
This commit is contained in:
Dawn Chen 2015-03-05 17:04:57 -08:00
commit 0415229794

View File

@ -26,14 +26,8 @@ type DockerCache interface {
}
func NewDockerCache(client DockerInterface) (DockerCache, error) {
containers, err := GetKubeletDockerContainers(client, false)
if err != nil {
return nil, err
}
return &dockerCache{
client: client,
cacheTime: time.Now(),
containers: containers,
updatingCache: false,
}, nil
}