Merge pull request #65595 from sjenning/feature-gate-lsi-capacity

Automatic merge from submit-queue (batch tested with PRs 60150, 65467, 65487, 65595, 65374). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. kubelet: feature gate LSI capacity calculation Currently if `cm.cadvisorInterface.RootFsInfo()` fails, the whole kubelet bails. If `/var/lib/kubelet` is on a tmpfs or bindmount, this can happen (this is the case for some of our CI envs https://github.com/openshift/origin/issues/19948). We would be able to workaround this, in the short term, by disabling the LSI feature gate if the capacity calculate was protected by the gate, but currently it isn't. This PR adds the gate check around setting the ephemeral storage capacity. @liggitt @derekwaynecarr @dashpole It might be a different discussion about whether or not this should be fatal. If it isn't fatal, seems that it would just prevent pods that had a ephemeral storage request from being scheduled. /sig node

Merge pull request #65595 from sjenning/feature-gate-lsi-capacity
93f3249e · Kubernetes Submit Queue · GitHub · 4859645c · 3234b0fa · 93f3249e
Unverified Commit 93f3249e authored Jun 28, 2018 by Kubernetes Submit Queue Committed by GitHub Jun 28, 2018
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 err != nil {
-		return fmt.Errorf("failed to get rootfs info: %v", err)
-	}
-	for rName, rCap := range cadvisor.EphemeralStorageCapacityFromFsInfo(rootfs) {
-		cm.capacity[rName] = rCap
+	if utilfeature.DefaultFeatureGate.Enabled(kubefeatures.LocalStorageCapacityIsolation) {
+		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
+		}
 	}

 	// Ensure that node allocatable configuration is valid.