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

DockerCache doesn't get containers at startup.

Merge pull request #5115 from vmarmol/fix-kubelet-start
04152297 · Dawn Chen · ca9d2430 · 33e6c3eb · 04152297
Commit 04152297 authored Mar 05, 2015 by Dawn Chen
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

docker_cache.go pkg/kubelet/dockertools/docker_cache.go +0 -6

No files found.
--- a/pkg/kubelet/dockertools/docker_cache.go
+++ b/pkg/kubelet/dockertools/docker_cache.go
@@ -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
 }