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

Improve terminated pod message when node is shutting down

Browse Source 
Signed-off-by: Guillaume Le Biller <glebiller@Traveldoo.com>
This commit is contained in:
Guillaume Le Biller 2021-06-15 14:24:05 +02:00
parent 36a19df91b
commit f1de598233
No known key found for this signature in database
GPG Key ID: A4E075C4D8E6F708
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 (
nodeShutdownReason = "Shutdown"
nodeShutdownMessage = "Node is shutting, evicting pods"
nodeShutdownNotAdmitMessage = "Node is in progress of shutting down, not admitting any new pods"
dbusReconnectPeriod = 1 * time.Second
nodeShutdownReason = "Terminated"
nodeShutdownMessage = "Pod was terminated in response to imminent node shutdown."
nodeShutdownNotAdmittedReason = "NodeShutdown"
nodeShutdownNotAdmittedMessage = "Pod was rejected as the node is shutting down."
dbusReconnectPeriod = 1 * time.Second
)
var systemDbus = func() (dbusInhibiter, error) {
@ -93,8 +94,8 @@ func (m *Manager) Admit(attrs *lifecycle.PodAdmitAttributes) lifecycle.PodAdmitR
if nodeShuttingDown {
return lifecycle.PodAdmitResult{
Admit: false,
Reason: nodeShutdownReason,
Message: nodeShutdownNotAdmitMessage,
Reason: nodeShutdownNotAdmittedReason,
Message: nodeShutdownNotAdmittedMessage,
}
}
return lifecycle.PodAdmitResult{Admit: true}
@ -270,8 +271,8 @@ func (m *Manager) processShutdownEvent() error {
status := v1.PodStatus{
Phase: v1.PodFailed,
Message: nodeShutdownMessage,
Reason: nodeShutdownReason,
Message: nodeShutdownMessage,
}
err := m.killPod(pod, status, &gracePeriodOverride)