salt: Set default drain timeout to 3600s

scality · Dec 9, 2021 · 423bff0 · 423bff0
1 parent 1b47e49
commit 423bff0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,7 @@
   (PR[#3607](https://github.com/scality/metalk8s/pull/3607))
 
 - Add ability to change the drain timeout from the upgrade and
-  downgrade scripts
+  downgrade scripts and default to 3600 seconds
   (PR[#3633](https://github.com/scality/metalk8s/pull/3633))
 
 ## Release 2.10.5

diff --git a/salt/_modules/metalk8s_drain.py b/salt/_modules/metalk8s_drain.py
@@ -166,7 +166,8 @@ def __init__(
         self._force = force
         self._grace_period = grace_period
         self._ignore_daemonset = ignore_daemonset
-        self._timeout = timeout or (2 ** 64 - 1)
+        # Default timeout is 3600 seconds
+        self._timeout = timeout or 3600
         self._delete_local_data = delete_local_data
         self._best_effort = best_effort
         self._kwargs = kwargs