Merge pull request #123904 from kannon92/innocent-eviction-potential-fix

innocent-pod should not be evicted due to exceeding requests/limits
This commit is contained in:
Kubernetes Prow Robot 2024-03-12 16:20:54 -07:00 committed by GitHub
commit f90461c43e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -970,6 +970,19 @@ func innocentPod() *v1.Pod {
"-c", "-c",
"while true; do sleep 5; done", "while true; do sleep 5; done",
}, },
Resources: v1.ResourceRequirements{
// These values are set so that we don't consider this pod to be over the limits
// If the requests are not set, then we assume a request limit of 0 so it is always over.
// This fixes this for the innocent pod.
Requests: v1.ResourceList{
v1.ResourceEphemeralStorage: resource.MustParse("50Mi"),
v1.ResourceMemory: resource.MustParse("50Mi"),
},
Limits: v1.ResourceList{
v1.ResourceEphemeralStorage: resource.MustParse("50Mi"),
v1.ResourceMemory: resource.MustParse("50Mi"),
},
},
}, },
}, },
}, },