From 8d37c3b8f24478fe36da23f3ac453767f438e80b Mon Sep 17 00:00:00 2001
From: SataQiu <1527062125@qq.com>
Date: Sat, 6 Jun 2020 18:19:47 +0800
Subject: [PATCH] kubectl: fix the bug that kubectl scale does not honor
 --timeout flag

Signed-off-by: SataQiu <1527062125@qq.com>
---
 staging/src/k8s.io/kubectl/pkg/cmd/scale/scale.go | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/scale/scale.go b/staging/src/k8s.io/kubectl/pkg/cmd/scale/scale.go
index 7cb3e9a3e6d..545ced9e356 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/scale/scale.go
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/scale/scale.go
@@ -62,10 +62,6 @@ var (
 		kubectl scale --replicas=3 statefulset/web`))
 )
 
-const (
-	timeout = 5 * time.Minute
-)
-
 type ScaleOptions struct {
 	FilenameOptions resource.FilenameOptions
 	RecordFlags     *genericclioptions.RecordFlags
@@ -234,7 +230,7 @@ func (o *ScaleOptions) RunScale() error {
 
 	var waitForReplicas *scale.RetryParams
 	if o.Timeout != 0 && o.dryRunStrategy == cmdutil.DryRunNone {
-		waitForReplicas = scale.NewRetryParams(1*time.Second, timeout)
+		waitForReplicas = scale.NewRetryParams(1*time.Second, o.Timeout)
 	}
 
 	counter := 0