github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-31 16:46:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #103137 from wzshiming/fix/expected_inhibit_delay

Browse Source 
Allow the actual inhibit delay to be greater than the expected inhibit delay
This commit is contained in:
Kubernetes Prow Robot
2021-08-17 11:41:49 -07:00
committed by GitHub
parent a9aad7e034 97bcfbd674
commit d7c1663556
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -157,7 +157,7 @@ func (m *Manager) start() (chan struct{}, error) {
return nil, err return nil, err
} }
if updatedInhibitDelay != m.shutdownGracePeriodRequested { if m.shutdownGracePeriodRequested > updatedInhibitDelay {
return nil, fmt.Errorf("node shutdown manager was unable to update logind InhibitDelayMaxSec to %v (ShutdownGracePeriod), current value of InhibitDelayMaxSec (%v) is less than requested ShutdownGracePeriod", m.shutdownGracePeriodRequested, updatedInhibitDelay) return nil, fmt.Errorf("node shutdown manager was unable to update logind InhibitDelayMaxSec to %v (ShutdownGracePeriod), current value of InhibitDelayMaxSec (%v) is less than requested ShutdownGracePeriod", m.shutdownGracePeriodRequested, updatedInhibitDelay)
} }
} }