Modifies tests to use new volume objects.

2014-07-29 10:51:59 -07:00
parent 6191ffc0de
commit 3f7f6cb2dc
4 changed files with 20 additions and 42 deletions
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -487,7 +487,13 @@ func (kl *Kubelet) determineActiveVolumes() map[string]volume.Cleaner {
 			name := result["volumeName"]
 			podID := result["podID"]
 			identifier := path.Join(podID, name)
-			activeVolumes[identifier], err = volume.CreateVolumeCleaner(kind, fullPath)
+			cleaner, err := volume.CreateVolumeCleaner(kind, fullPath)
+			if err != nil {
+				glog.Errorf("Could not create cleaner for volume %v.", identifier)
+			}
+			if cleaner != nil {
+				activeVolumes[identifier] = cleaner
+			}
 		}
 		return nil
 	})