github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feature gate LSI capacity calculation

Browse Source
This commit is contained in:
Seth Jennings
2018-06-28 14:01:08 -05:00
parent f8c4907bec
commit 3234b0fa5b
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/cm/container_manager_linux.go
View File

@@ -540,6 +540,7 @@ func (cm *containerManagerImpl) Start(node *v1.Node,
// allocatable of the node // allocatable of the node
cm.nodeInfo = node cm.nodeInfo = node
if utilfeature.DefaultFeatureGate.Enabled(kubefeatures.LocalStorageCapacityIsolation) {
rootfs, err := cm.cadvisorInterface.RootFsInfo() rootfs, err := cm.cadvisorInterface.RootFsInfo()
if err != nil { if err != nil {
return fmt.Errorf("failed to get rootfs info: %v", err) return fmt.Errorf("failed to get rootfs info: %v", err)
@@ -547,6 +548,7 @@ func (cm *containerManagerImpl) Start(node *v1.Node,
for rName, rCap := range cadvisor.EphemeralStorageCapacityFromFsInfo(rootfs) { for rName, rCap := range cadvisor.EphemeralStorageCapacityFromFsInfo(rootfs) {
cm.capacity[rName] = rCap cm.capacity[rName] = rCap
} }
}
// Ensure that node allocatable configuration is valid. // Ensure that node allocatable configuration is valid.
if err := cm.validateNodeAllocatable(); err != nil { if err := cm.validateNodeAllocatable(); err != nil {