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

Fix nodeShutdownReason for node shutdown e2e

Browse Source
This commit is contained in:
Shiming Zhang 2021-08-24 15:42:46 +08:00
parent b9565beef0
commit 86acf3bc8f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e_node/node_shutdown_linux_test.go
View File

@ -46,6 +46,7 @@ var _ = SIGDescribe("GracefulNodeShutdown [Serial] [NodeAlphaFeature:GracefulNod
ginkgo.Context("when gracefully shutting down", func() { ginkgo.Context("when gracefully shutting down", func() {
const ( const (
nodeShutdownReason = "Terminated"
pollInterval = 1 * time.Second pollInterval = 1 * time.Second
podStatusUpdateTimeout = 5 * time.Second podStatusUpdateTimeout = 5 * time.Second
nodeStatusUpdateTimeout = 10 * time.Second nodeStatusUpdateTimeout = 10 * time.Second
@ -124,7 +125,7 @@ var _ = SIGDescribe("GracefulNodeShutdown [Serial] [NodeAlphaFeature:GracefulNod
return fmt.Errorf("critical pod should not be shutdown, phase: %s", pod.Status.Phase) return fmt.Errorf("critical pod should not be shutdown, phase: %s", pod.Status.Phase)
} }
} else { } else {
if pod.Status.Phase != v1.PodFailed || pod.Status.Reason != "Shutdown" { if pod.Status.Phase != v1.PodFailed || pod.Status.Reason != nodeShutdownReason {
framework.Logf("Expecting non-critcal pod to be shutdown, but it's not currently. Pod: %q, Pod Status Phase: %q, Pod Status Reason: %q", pod.Name, pod.Status.Phase, pod.Status.Reason) framework.Logf("Expecting non-critcal pod to be shutdown, but it's not currently. Pod: %q, Pod Status Phase: %q, Pod Status Reason: %q", pod.Name, pod.Status.Phase, pod.Status.Reason)
return fmt.Errorf("pod should be shutdown, phase: %s", pod.Status.Phase) return fmt.Errorf("pod should be shutdown, phase: %s", pod.Status.Phase)
} }
@ -145,7 +146,7 @@ var _ = SIGDescribe("GracefulNodeShutdown [Serial] [NodeAlphaFeature:GracefulNod
framework.ExpectEqual(len(list.Items), len(pods), "the number of pods is not as expected") framework.ExpectEqual(len(list.Items), len(pods), "the number of pods is not as expected")
for _, pod := range list.Items { for _, pod := range list.Items {
if pod.Status.Phase != v1.PodFailed || pod.Status.Reason != "Shutdown" { if pod.Status.Phase != v1.PodFailed || pod.Status.Reason != nodeShutdownReason {
framework.Logf("Expecting pod to be shutdown, but it's not currently: Pod: %q, Pod Status Phase: %q, Pod Status Reason: %q", pod.Name, pod.Status.Phase, pod.Status.Reason) framework.Logf("Expecting pod to be shutdown, but it's not currently: Pod: %q, Pod Status Phase: %q, Pod Status Reason: %q", pod.Name, pod.Status.Phase, pod.Status.Reason)
return fmt.Errorf("pod should be shutdown, phase: %s", pod.Status.Phase) return fmt.Errorf("pod should be shutdown, phase: %s", pod.Status.Phase)
} }