github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #125832 from atiratree/fix-UnhealthyPodEvictionPolicy-e2e

Browse Source 
fix readiness flake in UnhealthyPodEvictionPolicy
This commit is contained in:
Kubernetes Prow Robot
2024-07-02 05:15:59 -07:00
committed by GitHub
parent e341d5b1aa 3f8d799c9f
commit a38cde339a
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e/apps/disruption.go
View File

@@ -474,7 +474,7 @@ var _ = SIGDescribe("DisruptionController", func() {
rs.Labels["name"] = rsName rs.Labels["name"] = rsName
initialDelaySeconds := framework.PodStartTimeout.Seconds() + 30 initialDelaySeconds := framework.PodStartTimeout.Seconds() + 30
if tc.podsShouldBecomeReadyFirst { if tc.podsShouldBecomeReadyFirst {
initialDelaySeconds = 0 initialDelaySeconds = 20
} }
rs.Spec.Template.Spec.Containers[0].ReadinessProbe = &v1.Probe{ rs.Spec.Template.Spec.Containers[0].ReadinessProbe = &v1.Probe{
ProbeHandler: v1.ProbeHandler{ ProbeHandler: v1.ProbeHandler{
@@ -511,6 +511,9 @@ var _ = SIGDescribe("DisruptionController", func() {
Namespace: ns, Namespace: ns,
}, },
} }
// New pods can be created between the evictions by a replica set controller.
// This can affect the PDB, and pods could potentially be evicted that shouldn't be.
// To prevent this, there should always be a sufficient pod readiness delay (see initialDelaySeconds).
err = cs.CoreV1().Pods(ns).EvictV1(ctx, e) err = cs.CoreV1().Pods(ns).EvictV1(ctx, e)
if err == nil { if err == nil {
evictedPods.Insert(pod.Name) evictedPods.Insert(pod.Name)