Skip to content

Commit 55476fb

Browse files
authored
Merge pull request kubernetes#93373 from liggitt/deflake-pod-collection
Delete pod collection immediately
2 parents 8a3fc2d + 6ef0fa6 commit 55476fb

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

test/e2e/common/pods.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -840,6 +840,8 @@ var _ = framework.KubeDescribe("Pods", func() {
840840
ginkgo.It("should delete a collection of pods", func() {
841841
podTestNames := []string{"test-pod-1", "test-pod-2", "test-pod-3"}
842842

843+
zero := int64(0)
844+
843845
ginkgo.By("Create set of pods")
844846
// create a set of pods in test namespace
845847
for _, podTestName := range podTestNames {
@@ -850,6 +852,7 @@ var _ = framework.KubeDescribe("Pods", func() {
850852
"type": "Testing"},
851853
},
852854
Spec: v1.PodSpec{
855+
TerminationGracePeriodSeconds: &zero,
853856
Containers: []v1.Container{{
854857
Image: imageutils.GetE2EImage(imageutils.Agnhost),
855858
Name: "token-test",
@@ -866,7 +869,7 @@ var _ = framework.KubeDescribe("Pods", func() {
866869
framework.ExpectNoError(err, "3 pods not found")
867870

868871
// delete Collection of pods with a label in the current namespace
869-
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).DeleteCollection(context.TODO(), metav1.DeleteOptions{}, metav1.ListOptions{
872+
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).DeleteCollection(context.TODO(), metav1.DeleteOptions{GracePeriodSeconds: &zero}, metav1.ListOptions{
870873
LabelSelector: "type=Testing"})
871874
framework.ExpectNoError(err, "failed to delete collection of pods")
872875

0 commit comments

Comments
 (0)