Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ignore mirror pods with RestartPolicy == Never in restart tests #34462

Merged
merged 1 commit into from
Oct 12, 2016
Merged

Ignore mirror pods with RestartPolicy == Never in restart tests #34462

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 28 additions & 2 deletions test/e2e/restart.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (

"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/fields"
kubepod "k8s.io/kubernetes/pkg/kubelet/pod"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/util/wait"
"k8s.io/kubernetes/test/e2e/framework"
Expand All @@ -30,6 +31,28 @@ import (
. "github.com/onsi/gomega"
)

func isRestartNeverMirrorPod(p *api.Pod) bool {
if !kubepod.IsMirrorPod(p) {
return false
}
return p.Spec.RestartPolicy == api.RestartPolicyNever
}

func filterIrrelevantPods(pods []*api.Pod) []*api.Pod {
var results []*api.Pod
for _, p := range pods {
if isRestartNeverMirrorPod(p) {
// Mirror pods with restart policy == Never will not get
// recreated if they are deleted after the pods have
// terminated. For now, we discount such pods.
// https://github.com/kubernetes/kubernetes/issues/34003
continue
}
results = append(results, p)
}
return results
}

var _ = framework.KubeDescribe("Restart [Disruptive]", func() {
f := framework.NewDefaultFramework("restart")
var ps *framework.PodStore
Expand Down Expand Up @@ -57,7 +80,9 @@ var _ = framework.KubeDescribe("Restart [Disruptive]", func() {
framework.Logf("Got the following nodes before restart: %v", nodeNamesBefore)

By("ensuring all pods are running and ready")
pods := ps.List()
allPods := ps.List()
pods := filterIrrelevantPods(allPods)

podNamesBefore := make([]string, len(pods))
for i, p := range pods {
podNamesBefore[i] = p.ObjectMeta.Name
Expand Down Expand Up @@ -105,7 +130,8 @@ func waitForNPods(ps *framework.PodStore, expect int, timeout time.Duration) ([]
var pods []*api.Pod
var errLast error
found := wait.Poll(framework.Poll, timeout, func() (bool, error) {
pods = ps.List()
allPods := ps.List()
pods := filterIrrelevantPods(allPods)
if len(pods) != expect {
errLast = fmt.Errorf("expected to find %d pods but found only %d", expect, len(pods))
framework.Logf("Error getting pods: %v", errLast)
Expand Down