github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #102840 from Kissy/issue-102820

Browse Source 
Improve terminated pod message when node is shutting down
This commit is contained in:
Kubernetes Prow Robot 2021-06-16 12:48:12 -07:00 committed by GitHub
commit 2d7a20fcd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/kubelet/nodeshutdown/nodeshutdown_manager_linux.go
View File

@ -36,10 +36,11 @@ import (
) )
const ( const (
nodeShutdownReason = "Shutdown" nodeShutdownReason = "Terminated"
nodeShutdownMessage = "Node is shutting, evicting pods" nodeShutdownMessage = "Pod was terminated in response to imminent node shutdown."
nodeShutdownNotAdmitMessage = "Node is in progress of shutting down, not admitting any new pods" nodeShutdownNotAdmittedReason = "NodeShutdown"
dbusReconnectPeriod = 1 * time.Second nodeShutdownNotAdmittedMessage = "Pod was rejected as the node is shutting down."
dbusReconnectPeriod = 1 * time.Second
) )
var systemDbus = func() (dbusInhibiter, error) { var systemDbus = func() (dbusInhibiter, error) {
@ -93,8 +94,8 @@ func (m *Manager) Admit(attrs *lifecycle.PodAdmitAttributes) lifecycle.PodAdmitR
if nodeShuttingDown { if nodeShuttingDown {
return lifecycle.PodAdmitResult{ return lifecycle.PodAdmitResult{
Admit: false, Admit: false,
Reason: nodeShutdownReason, Reason: nodeShutdownNotAdmittedReason,
Message: nodeShutdownNotAdmitMessage, Message: nodeShutdownNotAdmittedMessage,
} }
} }
return lifecycle.PodAdmitResult{Admit: true} return lifecycle.PodAdmitResult{Admit: true}
@ -270,8 +271,8 @@ func (m *Manager) processShutdownEvent() error {
status := v1.PodStatus{ status := v1.PodStatus{
Phase: v1.PodFailed, Phase: v1.PodFailed,
Message: nodeShutdownMessage,
Reason: nodeShutdownReason, Reason: nodeShutdownReason,
Message: nodeShutdownMessage,
} }
err := m.killPod(pod, status, &gracePeriodOverride) err := m.killPod(pod, status, &gracePeriodOverride)