From 7294a1d8fa543b61ad37f7b9b9d0b42ccd607948 Mon Sep 17 00:00:00 2001 From: David Ashpole Date: Wed, 6 Dec 2017 12:58:53 -0800 Subject: [PATCH] make requirements less precise for disk eviction test --- test/e2e_node/eviction_test.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/e2e_node/eviction_test.go b/test/e2e_node/eviction_test.go index 0d2cf113bac..1f48d0a406c 100644 --- a/test/e2e_node/eviction_test.go +++ b/test/e2e_node/eviction_test.go @@ -225,6 +225,10 @@ var _ = framework.KubeDescribe("LocalStorageCapacityIsolationEviction [Slow] [Se EmptyDir: &v1.EmptyDirVolumeSource{SizeLimit: &sizeLimit}, }, v1.ResourceRequirements{}), }, + { + evictionPriority: 0, // This pod should not be evicted because it uses less than its limit + pod: diskConsumingPod("emptydir-disk-below-sizelimit", useUnderLimit, nil, v1.ResourceRequirements{Limits: containerLimit}), + }, }) }) }) @@ -306,7 +310,8 @@ var _ = framework.KubeDescribe("PriorityLocalStorageEvictionOrdering [Slow] [Ser }, { evictionPriority: 0, - pod: diskConsumingPod("guaranteed-disk", 299 /* Mb */, nil, v1.ResourceRequirements{ + // Only require 99% accuracy (297/300 Mb) because on some OS distributions, the file itself (excluding contents), consumes disk space. + pod: diskConsumingPod("guaranteed-disk", 297 /* Mb */, nil, v1.ResourceRequirements{ Requests: v1.ResourceList{ v1.ResourceEphemeralStorage: resource.MustParse("300Mi"), },