From 97bcfbd674b324295bb1e2e7890f126c0676f7ee Mon Sep 17 00:00:00 2001 From: Shiming Zhang Date: Thu, 24 Jun 2021 13:26:28 +0800 Subject: [PATCH] Allow the actual inhibit delay to be greater than the expected inhibit delay --- pkg/kubelet/nodeshutdown/nodeshutdown_manager_linux.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/kubelet/nodeshutdown/nodeshutdown_manager_linux.go b/pkg/kubelet/nodeshutdown/nodeshutdown_manager_linux.go index 3c33f56f5c6..121af0954fc 100644 --- a/pkg/kubelet/nodeshutdown/nodeshutdown_manager_linux.go +++ b/pkg/kubelet/nodeshutdown/nodeshutdown_manager_linux.go @@ -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) } }