update loginoptions field to RequestTimeout of type duration

Author: juanvallejo

pkg/cmd/cli/cmd/login/login.go

@@ -11,6 +11,7 @@ import (
 
 	kapierrors "k8s.io/kubernetes/pkg/api/errors"
 	"k8s.io/kubernetes/pkg/api/unversioned"
+	kclientcmd "k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
 	kclientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 	"k8s.io/kubernetes/pkg/util/term"
@@ -105,7 +106,12 @@ func (o *LoginOptions) Complete(f *osclientcmd.Factory, cmd *cobra.Command, args
 		o.StartingKubeConfig = kclientcmdapi.NewConfig()
 	}
 
-	o.Timeout = kcmdutil.GetFlagString(cmd, "request-timeout")
+	unparsedTimeout := kcmdutil.GetFlagString(cmd, "request-timeout")
+	timeout, err := kclientcmd.ParseTimeout(unparsedTimeout)
+	if err != nil {
+		return err
+	}
+	o.RequestTimeout = timeout
 
 	o.CommandName = commandName
 	if o.CommandName == "" {

pkg/cmd/cli/cmd/login/loginoptions.go

@@ -9,14 +9,14 @@ import (
 	"net"
 	"os"
 	"path/filepath"
+	"time"
 
 	kapi "k8s.io/kubernetes/pkg/api"
 	kerrors "k8s.io/kubernetes/pkg/api/errors"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/client/restclient"
 	kclientcmd "k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
 	kclientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
-	clientcmdutil "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/util"
 	"k8s.io/kubernetes/pkg/util/sets"
 	kterm "k8s.io/kubernetes/pkg/util/term"
 
@@ -66,8 +66,8 @@ type LoginOptions struct {
 
 	PathOptions *kclientcmd.PathOptions
 
-	CommandName string
-	Timeout     string
+	CommandName    string
+	RequestTimeout time.Duration
 }
 
 // Gather all required information in a comprehensive order.
@@ -101,6 +101,11 @@ func (o *LoginOptions) getClientConfig() (*restclient.Config, error) {
 
 	clientConfig := &restclient.Config{}
 
+	// ensure clientConfig has timeout option
+	if o.RequestTimeout > 0 {
+		clientConfig.Timeout = o.RequestTimeout
+	}
+
 	// normalize the provided server to a format expected by config
 	serverNormalized, err := config.NormalizeServerURL(o.Server)
 	if err != nil {
@@ -170,14 +175,6 @@ func (o *LoginOptions) gatherAuthInfo() error {
 		return err
 	}
 
-	// ensure clientConfig has timeout option
-	if len(o.Timeout) > 0 {
-		err := clientcmdutil.SetTimeout(o.Timeout, directClientConfig)
-		if err != nil {
-			return err
-		}
-	}
-
 	// make a copy and use it to avoid mutating the original
 	t := *directClientConfig
 	clientConfig := &t