From 1091d1a6ed2a35952df727a1e762ceba30b0638d Mon Sep 17 00:00:00 2001 From: Sergey Dudoladov Date: Mon, 28 Jan 2019 16:57:26 +0100 Subject: [PATCH] use same conf option in all cases --- pkg/controller/node.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/controller/node.go b/pkg/controller/node.go index 1700ca176..d067f7728 100644 --- a/pkg/controller/node.go +++ b/pkg/controller/node.go @@ -80,16 +80,18 @@ func (c *Controller) nodeUpdate(prev, cur interface{}) { if !c.nodeIsReady(nodePrev) || c.nodeIsReady(nodeCur) { return } - err := retryutil.Retry(2 * time.Minute, 10 * time.Minute, + + err := retryutil.Retry(1 * time.Minute, c.opConfig.MasterPodMoveTimeout, func() (bool, error) { err := c.moveMasterPodsOffNode(nodeCur) if err != nil { - return false, fmt.Errorf(("Unable to move master pods off the unschedulable node. Will retry after delay")) + return false, fmt.Errorf("unable to move master pods off the unschedulable node; will retry after delay") } return true, nil } ) + if err != nil { - c.logger.Warning("Unable to move maser pods") + c.logger.Warning("failed to move master pods from the node %q: timeout expired", nodeCur.Name) } }