Skip to content

K
k3s
Commit 33c1c938 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #35984 from zmerlynn/make-disruption-less-flakey

Automatic merge from submit-queue Disruption e2e: wait for running pods in the table test, too **What this PR does / why we need it**: Makes the `DisruptionController` tests less flaky. **Which issue this PR fixes**: fixes #34032
parents edab99bf f8de9abf
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
test/e2e/disruption.go
View file @ 33c1c938
...@@ -163,6 +163,11 @@ var _ = framework.KubeDescribe("DisruptionController", func() { ...@@ -163,6 +163,11 @@ var _ = framework.KubeDescribe("DisruptionController", func() {
err = cs.Pods(ns).Evict(e) err = cs.Pods(ns).Evict(e)
Expect(err).Should(MatchError("Cannot evict pod as it would violate the pod's disruption budget.")) Expect(err).Should(MatchError("Cannot evict pod as it would violate the pod's disruption budget."))
} else { } else {
// Only wait for running pods in the "allow" case
// because one of shouldDeny cases relies on the
// replicaSet not fitting on the cluster.
waitForPodsOrDie(cs, ns, c.podCount+int(c.replicaSetSize))
// Since disruptionAllowed starts out false, if an eviction is ever allowed, // Since disruptionAllowed starts out false, if an eviction is ever allowed,
// that means the controller is working. // that means the controller is working.
err = wait.PollImmediate(framework.Poll, timeout, func() (bool, error) { err = wait.PollImmediate(framework.Poll, timeout, func() (bool, error) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment