do not use global timeout flag if server

openshift · Oct 6, 2016 · 825b616 · 825b616
1 parent a0012ea
commit 825b616
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/pkg/cmd/cli/cmd/version.go b/pkg/cmd/cli/cmd/version.go
@@ -72,7 +72,11 @@ func (o *VersionOptions) Complete(cmd *cobra.Command, f *clientcmd.Factory, out
 	}
 
 	// apply global timeout, if zero, apply custom 10s timeout
-	o.Timeout = kcmdutil.GetFlagDuration(cmd, "request-timeout")
+	o.Timeout = 0
+	if !o.IsServer {
+		// "request-timeout" option is only available to cli sub-commands
+		o.Timeout = kcmdutil.GetFlagDuration(cmd, "request-timeout")
+	}
 	if o.Timeout == 0 {
 		o.Timeout = time.Duration(10 * time.Second)
 	}