upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-06-09 08:55:55 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
commit d7c1663556
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats 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
}
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)
}
}