Merge pull request #933 from derekwaynecarr/issue_878

Enforce isDir, elliminates message in kubelet.log
This commit is contained in:
brendandburns 2014-08-18 11:07:59 -07:00
commit 53f53516f6

View File

@ -167,6 +167,9 @@ func GetCurrentVolumes(rootDirectory string) map[string]Cleaner {
// Volume information is extracted from the directory structure:
// (ROOT_DIR)/(POD_ID)/volumes/(VOLUME_KIND)/(VOLUME_NAME)
for _, podIDDir := range podIDDirs {
if !podIDDir.IsDir() {
continue
}
podID := podIDDir.Name()
podIDPath := path.Join(mountPath, podID, "volumes")
volumeKindDirs, err := ioutil.ReadDir(podIDPath)