Commit 6419b43a authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub

Merge pull request #27111 from mikedanese/err-check

Automatic merge from submit-queue e2e: actually check error when we fail to GET the scheduled pod and GET the pod before we try to gracefully delete it. and add a debug log. ref #26224
parents 5d871019 03fd3b61
......@@ -346,6 +346,11 @@ var _ = framework.KubeDescribe("Pods", func() {
// We need to wait for the pod to be scheduled, otherwise the deletion
// will be carried out immediately rather than gracefully.
framework.ExpectNoError(f.WaitForPodRunning(pod.Name))
// save the scheduled pod
if pod, err = podClient.Get(pod.Name); err != nil {
Expect(err).NotTo(HaveOccurred(), "failed to GET scheduled pod")
}
framework.Logf("scheduled pod: %#v", pod)
By("deleting the pod gracefully")
if err := podClient.Delete(pod.Name, api.NewDeleteOptions(30)); err != nil {
......@@ -353,7 +358,6 @@ var _ = framework.KubeDescribe("Pods", func() {
}
By("verifying the kubelet observed the termination notice")
pod, err = podClient.Get(pod.Name)
Expect(wait.Poll(time.Second*5, time.Second*30, func() (bool, error) {
podList, err := framework.GetKubeletPods(f.Client, pod.Spec.NodeName)
if err != nil {
......
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