Revert "Avoid disk eviction node e2e test using up all the disk space"
This commit is contained in:
@@ -110,12 +110,6 @@ var _ = framework.KubeDescribe("Kubelet Eviction Manager [Serial] [Disruptive]",
|
||||
nodeDiskPressureCondition := false
|
||||
podRescheduleable := false
|
||||
Eventually(func() error {
|
||||
// Avoid the test using up all the disk space
|
||||
err := checkDiskUsage(0.05)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// The pod should be evicted.
|
||||
if !evictionOccurred {
|
||||
podData, err := podClient.Get(busyPodName)
|
||||
@@ -233,29 +227,3 @@ func isImageSupported() bool {
|
||||
// instead of skipping images the eviction thresholds should be adjusted based on the images.
|
||||
return strings.Contains(framework.TestContext.NodeName, "-gci-dev-")
|
||||
}
|
||||
|
||||
// checkDiskUsage verifies that the available bytes on disk are above the limit.
|
||||
func checkDiskUsage(limit float64) error {
|
||||
summary, err := getNodeSummary()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if nodeFs := summary.Node.Fs; nodeFs != nil {
|
||||
if nodeFs.AvailableBytes != nil && nodeFs.CapacityBytes != nil {
|
||||
if float64(*nodeFs.CapacityBytes)*limit > float64(*nodeFs.AvailableBytes) {
|
||||
return fmt.Errorf("available nodefs byte is less than %v%%", int(limit)*100)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if summary.Node.Runtime != nil {
|
||||
if imageFs := summary.Node.Runtime.ImageFs; imageFs != nil {
|
||||
if float64(*imageFs.CapacityBytes)*limit > float64(*imageFs.AvailableBytes) {
|
||||
return fmt.Errorf("available imagefs byte is less than %v%%", int(limit)*100)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
Reference in New Issue
Block a user