mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 11:21:47 +00:00
Fix nodeShutdownReason for node shutdown e2e
This commit is contained in:
parent
b9565beef0
commit
86acf3bc8f
@ -46,6 +46,7 @@ var _ = SIGDescribe("GracefulNodeShutdown [Serial] [NodeAlphaFeature:GracefulNod
|
||||
ginkgo.Context("when gracefully shutting down", func() {
|
||||
|
||||
const (
|
||||
nodeShutdownReason = "Terminated"
|
||||
pollInterval = 1 * time.Second
|
||||
podStatusUpdateTimeout = 5 * 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)
|
||||
}
|
||||
} 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)
|
||||
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")
|
||||
|
||||
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)
|
||||
return fmt.Errorf("pod should be shutdown, phase: %s", pod.Status.Phase)
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user