github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #68621 from jcsirot/fix-deleting-critical-pod

Browse Source 
Move pod created into kube-system namespace delete call into a defer …
This commit is contained in:
k8s-ci-robot 2018-09-29 07:58:07 -07:00 committed by GitHub
commit bcc23dfdc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/e2e/scheduling/preemption.go
View File

@ -175,6 +175,11 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
}) })
// Make sure that the lowest priority pod is deleted. // Make sure that the lowest priority pod is deleted.
preemptedPod, err := cs.CoreV1().Pods(pods[0].Namespace).Get(pods[0].Name, metav1.GetOptions{}) preemptedPod, err := cs.CoreV1().Pods(pods[0].Namespace).Get(pods[0].Name, metav1.GetOptions{})
defer func() {
// Clean-up the critical pod
err := f.ClientSet.CoreV1().Pods(metav1.NamespaceSystem).Delete("critical-pod", metav1.NewDeleteOptions(0))
framework.ExpectNoError(err)
}()
podDeleted := (err != nil && errors.IsNotFound(err)) || podDeleted := (err != nil && errors.IsNotFound(err)) ||
(err == nil && preemptedPod.DeletionTimestamp != nil) (err == nil && preemptedPod.DeletionTimestamp != nil)
Expect(podDeleted).To(BeTrue()) Expect(podDeleted).To(BeTrue())
@ -184,9 +189,6 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
framework.ExpectNoError(err) framework.ExpectNoError(err)
Expect(livePod.DeletionTimestamp).To(BeNil()) Expect(livePod.DeletionTimestamp).To(BeNil())
} }
// Clean-up the critical pod
err = f.ClientSet.CoreV1().Pods(metav1.NamespaceSystem).Delete("critical-pod", metav1.NewDeleteOptions(0))
framework.ExpectNoError(err)
}) })
// This test verifies that when a high priority pod is pending and its // This test verifies that when a high priority pod is pending and its
@ -341,11 +343,13 @@ var _ = SIGDescribe("PodPriorityResolution [Serial]", func() {
Namespace: metav1.NamespaceSystem, Namespace: metav1.NamespaceSystem,
PriorityClassName: spc, PriorityClassName: spc,
}) })
defer func() {
// Clean-up the pod.
err := f.ClientSet.CoreV1().Pods(pod.Namespace).Delete(pod.Name, metav1.NewDeleteOptions(0))
framework.ExpectNoError(err)
}()
Expect(pod.Spec.Priority).NotTo(BeNil()) Expect(pod.Spec.Priority).NotTo(BeNil())
framework.Logf("Created pod: %v", pod.Name) framework.Logf("Created pod: %v", pod.Name)
// Clean-up the pod.
err := f.ClientSet.CoreV1().Pods(pod.Namespace).Delete(pod.Name, metav1.NewDeleteOptions(0))
framework.ExpectNoError(err)
} }
}) })
}) })