feature gate LSI capacity calculation

3234b0fa · Seth Jennings · f8c4907b · 3234b0fa
Commit 3234b0fa authored Jun 28, 2018 by Seth Jennings
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 6 deletions

container_manager_linux.go pkg/kubelet/cm/container_manager_linux.go +8 -6

No files found.
--- a/pkg/kubelet/cm/container_manager_linux.go
+++ b/pkg/kubelet/cm/container_manager_linux.go
@@ -540,12 +540,14 @@ func (cm *containerManagerImpl) Start(node *v1.Node,
 	// allocatable of the node
 	cm.nodeInfo = node
-	rootfs, err := cm.cadvisorInterface.RootFsInfo()
+	if utilfeature.DefaultFeatureGate.Enabled(kubefeatures.LocalStorageCapacityIsolation) {
-	if err != nil {
+		rootfs, err := cm.cadvisorInterface.RootFsInfo()
-		return fmt.Errorf("failed to get rootfs info: %v", err)
+		if err != nil {
-	}
+			return fmt.Errorf("failed to get rootfs info: %v", err)
-	for rName, rCap := range cadvisor.EphemeralStorageCapacityFromFsInfo(rootfs) {
+		}
-		cm.capacity[rName] = rCap
+		for rName, rCap := range cadvisor.EphemeralStorageCapacityFromFsInfo(rootfs) {
+			cm.capacity[rName] = rCap
+		}
 	}
 	// Ensure that node allocatable configuration is valid.