UPSTREAM: <drop>: make RootFsInfo error non-fatal on start

openshift · Jul 23, 2018 · 3587ab4 · 3587ab4
1 parent c663c85
commit 3587ab4
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/pkg/kubelet/cm/container_manager_linux.go b/pkg/kubelet/cm/container_manager_linux.go
@@ -542,10 +542,11 @@ func (cm *containerManagerImpl) Start(node *v1.Node,
 
 	rootfs, err := cm.cadvisorInterface.RootFsInfo()
 	if err != nil {
-		return fmt.Errorf("failed to get rootfs info: %v", err)
-	}
-	for rName, rCap := range cadvisor.EphemeralStorageCapacityFromFsInfo(rootfs) {
-		cm.capacity[rName] = rCap
+		glog.Errorf("failed to get rootfs info,  cannot set ephemeral storage capacity: %v", err)
+	} else {
+		for rName, rCap := range cadvisor.EphemeralStorageCapacityFromFsInfo(rootfs) {
+			cm.capacity[rName] = rCap
+		}
 	}
 
 	// Ensure that node allocatable configuration is valid.