Skip to content

Commit

Permalink
fix: inhibit timer to follow kubelet timer
Browse files Browse the repository at this point in the history
ensure to wait as long as possibly given to kubelet shutdown timers. Related to fix of siderolabs#7138

Signed-off-by: Niklas Wik <niklas.wik@nokia.com>
  • Loading branch information
salkin committed May 4, 2023
1 parent cbf6dc1 commit 3cee02f
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -1604,7 +1604,7 @@ func stopAndRemoveAllPods(stopAction cri.StopAction) runtime.TaskExecutionFunc {

logger.Printf("shutting down kubelet gracefully")

shutdownCtx, shutdownCtxCancel := context.WithTimeout(ctx, constants.KubeletShutdownGracePeriod*2)
shutdownCtx, shutdownCtxCancel := context.WithTimeout(ctx, constants.KubeletShutdownGracePeriod*40)
defer shutdownCtxCancel()

if err = r.State().Machine().DBus().WaitShutdown(shutdownCtx); err != nil {
Expand Down

0 comments on commit 3cee02f

Please sign in to comment.