Skip to content

Commit f90461c

Browse files
authored
Merge pull request kubernetes#123904 from kannon92/innocent-eviction-potential-fix
innocent-pod should not be evicted due to exceeding requests/limits
2 parents 2e528db + 19ae61b commit f90461c

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

test/e2e_node/eviction_test.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -970,6 +970,19 @@ func innocentPod() *v1.Pod {
970970
"-c",
971971
"while true; do sleep 5; done",
972972
},
973+
Resources: v1.ResourceRequirements{
974+
// These values are set so that we don't consider this pod to be over the limits
975+
// If the requests are not set, then we assume a request limit of 0 so it is always over.
976+
// This fixes this for the innocent pod.
977+
Requests: v1.ResourceList{
978+
v1.ResourceEphemeralStorage: resource.MustParse("50Mi"),
979+
v1.ResourceMemory: resource.MustParse("50Mi"),
980+
},
981+
Limits: v1.ResourceList{
982+
v1.ResourceEphemeralStorage: resource.MustParse("50Mi"),
983+
v1.ResourceMemory: resource.MustParse("50Mi"),
984+
},
985+
},
973986
},
974987
},
975988
},

0 commit comments

Comments
 (0)