handle cmds with custom timeouts

pkg/cmd/cli/cmd/version.go

@@ -35,6 +35,8 @@ type VersionOptions struct {
 	ClientConfig kclientcmd.ClientConfig
 	Clients      func() (*client.Client, *kclient.Client, error)
 
+	Timeout time.Duration
+
 	IsServer            bool
 	PrintEtcdVersion    bool
 	PrintClientFeatures bool
@@ -49,7 +51,7 @@ func NewCmdVersion(fullName string, f *clientcmd.Factory, out io.Writer, options
 		Run: func(cmd *cobra.Command, args []string) {
 			options.BaseName = fullName
 
-			if err := options.Complete(f, out); err != nil {
+			if err := options.Complete(cmd, f, out); err != nil {
 				kcmdutil.CheckErr(kcmdutil.UsageError(cmd, err.Error()))
 			}
 
@@ -62,13 +64,19 @@ func NewCmdVersion(fullName string, f *clientcmd.Factory, out io.Writer, options
 	return cmd
 }
 
-func (o *VersionOptions) Complete(f *clientcmd.Factory, out io.Writer) error {
+func (o *VersionOptions) Complete(cmd *cobra.Command, f *clientcmd.Factory, out io.Writer) error {
 	o.Out = out
 
 	if f == nil {
 		return nil
 	}
 
+	// apply global timeout, if zero, apply custom 10s timeout
+	o.Timeout = kcmdutil.GetFlagDuration(cmd, "timeout")
+	if o.Timeout == 0 {
+		o.Timeout = time.Duration(10 * time.Second)
+	}
+
 	o.Clients = f.Clients
 	o.ClientConfig = f.OpenShiftClientConfig
 	return nil
@@ -101,9 +109,6 @@ func (o VersionOptions) RunVersion() error {
 		return nil
 	}
 
-	// max amount of time we want to wait for server to respond
-	timeout := 10 * time.Second
-
 	done := make(chan error)
 	oVersion := ""
 	kVersion := ""
@@ -169,7 +174,7 @@ func (o VersionOptions) RunVersion() error {
 		if closed && err != nil {
 			return err
 		}
-	case <-time.After(timeout):
+	case <-time.After(o.Timeout):
 		return fmt.Errorf("%s", "error: server took too long to respond with version information.")
 	}